diff --git a/.gitignore b/.gitignore index b504ebe..00440ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ wxapt-1.3.tar.gz -/wxapt-1.7.1.tar.bz2 diff --git a/sources b/sources index f5f6edb..dc03835 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wxapt-1.7.1.tar.bz2) = 7faefbcae6e411ade931ee2103aac85338811048e773e131d6b9a1d8a62012d6800b8bdfab80a25ce46a4498f6d4b34cbd334e88d838f872a73d704b1b539501 +04bc342743af558cd7f95c62ce4a84bc wxapt-1.3.tar.gz diff --git a/wxapt.makefile.patch b/wxapt.makefile.patch new file mode 100644 index 0000000..36ad3d9 --- /dev/null +++ b/wxapt.makefile.patch @@ -0,0 +1,35 @@ +diff -up wxapt/Makefile.orig wxapt/Makefile +--- wxapt/Makefile.orig 2007-11-23 02:18:31.000000000 -0500 ++++ wxapt/Makefile 2009-01-14 10:29:28.000000000 -0500 +@@ -2,10 +2,12 @@ + + SHELL = /bin/sh + PROJECT = wxapt +-BINDIR = /usr/local/bin +-DOCDIR = /usr/local/share/doc/ ++BINDIR = /usr/bin ++DOCDIR = /usr/share/doc/ + CC = gcc -Wall -O2 -march=native + ++DESTDIR= ++ + objects = image.o sound.o wxapt.o + + $(PROJECT) : $(objects) +@@ -14,13 +16,10 @@ $(PROJECT) : $(objects) + $(objects) : $(PROJECT).h + + install : $(PROJECT) +- install -m 755 --strip $(PROJECT) $(BINDIR) +- install -m 644 doc/$(PROJECT).html $(DOCDIR) +- ++ install -D -m 755 $(PROJECT) $(DESTDIR)$(BINDIR)/$(PROJECT) + uninstall : +- rm $(BINDIR)/$(PROJECT) +- rm $(DOCDIR)/$(PROJECT).html +- ++ rm $(DESTDIR)$(BINDIR)/$(PROJECT) ++ rm $(DESTDIR)$(DOCDIR)/$(PROJECT).html + clean : + rm -f *.o *~ + diff --git a/wxapt.spec b/wxapt.spec index c490e4e..264f9ab 100644 --- a/wxapt.spec +++ b/wxapt.spec @@ -1,128 +1,50 @@ Name: wxapt -Version: 1.7.1 -Release: 16%{?dist} +Version: 1.3 +Release: 9%{?dist} Summary: Console application for decoding and saving weather images -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -URL: http://www.5b4az.org/ -Source0: http://www.5b4az.org/pkg/apt/wxapt/%{name}-%{version}.tar.bz2 +Group: Applications/Communications +License: GPLv2+ +URL: http://5b4az.chronos.org.uk/pages/apt.html +Source0: http://5b4az.chronos.org.uk/pkg/apt/wxapt/%{name}-%{version}.tar.gz +Patch0: wxapt.makefile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: make -BuildRequires: gcc -BuildRequires: autoconf automake libtool gettext -BuildRequires: alsa-lib-devel BuildRequires: ncurses-devel -BuildRequires: rtl-sdr-devel +#Requires: +#ExcludeArch: PPC +#ExcludeArch: PPC64 %description wxapt is a console application for decoding and saving weather images transmitted in the APT format of NOAA and METEOR satellites. %prep -%autosetup -p1 -autoreconf -fiv - +%setup -qn %{name} +%patch0 -p1 -b makefile.patch +#fix CFLAG from upstream +sed -i -e 's/-march=native//g' Makefile %build -%configure -%make_build - +make CFLAGS="%{optflags}" %{?_smp_mflags} %install +rm -rf $RPM_BUILD_ROOT #skip make install and do manual install, it's just one file -mkdir -p %{buildroot}%{_bindir} -install -pm 0755 src/%{name} %{buildroot}%{_bindir}/ +install -D -m 0755 wxapt $RPM_BUILD_ROOT%{_bindir}/%{name} +#skip .desktop file as this is a command line application + +%clean +rm -rf $RPM_BUILD_ROOT %files -%doc AUTHORS NEWS README doc/*.html -%license COPYING LICENSE -%{_bindir}/%{name} +%defattr(-,root,root,-) +%doc AUTHORS README +%{_bindir}/* %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.7.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.7.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 1.7.1-14 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.7.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Apr 09 2024 Jaroslav Škarvada - 1.7.1-12 -- Rebuilt for new rtl-sdr - -* Sat Jan 27 2024 Fedora Release Engineering - 1.7.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.7.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.7.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.7.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.7.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.7.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.7.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.7.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.7.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.7.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Mar 05 2019 Richard Shaw - 1.7.1-1 -- Update to 1.7.1. - -* Sun Feb 03 2019 Fedora Release Engineering - 1.3-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.3-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.3-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.3-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.3-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.3-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - * Fri Feb 15 2013 Fedora Release Engineering - 1.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild