diff --git a/.gitignore b/.gitignore index 00440ed..b504ebe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wxapt-1.3.tar.gz +/wxapt-1.7.1.tar.bz2 diff --git a/sources b/sources index dc03835..f5f6edb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04bc342743af558cd7f95c62ce4a84bc wxapt-1.3.tar.gz +SHA512 (wxapt-1.7.1.tar.bz2) = 7faefbcae6e411ade931ee2103aac85338811048e773e131d6b9a1d8a62012d6800b8bdfab80a25ce46a4498f6d4b34cbd334e88d838f872a73d704b1b539501 diff --git a/wxapt.makefile.patch b/wxapt.makefile.patch deleted file mode 100644 index 36ad3d9..0000000 --- a/wxapt.makefile.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 861cc0e..c18447f 100644 --- a/wxapt.spec +++ b/wxapt.spec @@ -1,45 +1,48 @@ Name: wxapt -Version: 1.3 -Release: 20%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: Console application for decoding and saving weather images 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 +URL: http://www.5b4az.org/ +Source0: http://www.5b4az.org/pkg/apt/wxapt/%{name}-%{version}.tar.bz2 BuildRequires: gcc +BuildRequires: autoconf automake libtool gettext +BuildRequires: alsa-lib-devel BuildRequires: ncurses-devel -#Requires: -#ExcludeArch: PPC -#ExcludeArch: PPC64 +BuildRequires: rtl-sdr-devel %description wxapt is a console application for decoding and saving weather images transmitted in the APT format of NOAA and METEOR satellites. %prep -%setup -qn %{name} -%patch0 -p1 -b makefile.patch -#fix CFLAG from upstream -sed -i -e 's/-march=native//g' Makefile +%autosetup -p1 +autoreconf -fiv + %build -make CFLAGS="%{optflags}" %{?_smp_mflags} +%configure +%make_build + %install -rm -rf $RPM_BUILD_ROOT #skip make install and do manual install, it's just one file -install -D -m 0755 wxapt $RPM_BUILD_ROOT%{_bindir}/%{name} -#skip .desktop file as this is a command line application +mkdir -p %{buildroot}%{_bindir} +install -pm 0755 src/%{name} %{buildroot}%{_bindir}/ %files -%doc AUTHORS README -%{_bindir}/* +%doc AUTHORS NEWS README doc/*.html +%license COPYING LICENSE +%{_bindir}/%{name} %changelog +* 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