diff --git a/.gitignore b/.gitignore index dc4112d..2aa24ef 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ fldigi-3.20.20.tar.gz /fldigi-3.22.05.tar.gz /fldigi-3.22.06.tar.gz /fldigi-3.22.07.tar.gz +/fldigi-3.22.08.tar.gz diff --git a/fldigi.spec b/fldigi.spec index 2d103e9..9d62d5b 100755 --- a/fldigi.spec +++ b/fldigi.spec @@ -1,9 +1,8 @@ -%{!?_licensedir:%global license %%doc} #global prerel AM Name: fldigi -Version: 3.22.07 -Release: 2%{?prerel:.%{prerel}}%{?dist} +Version: 3.22.08 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: Digital modem program for Linux Group: Applications/Communications License: GPLv3+ @@ -26,6 +25,7 @@ BuildRequires: libsamplerate-devel BuildRequires: pulseaudio-libs-devel BuildRequires: gettext BuildRequires: libXinerama-devel +BuildRequires: flxmlrpc-devel >= 0.1.0 Provides: flarq Provides: %{name}-shell @@ -41,10 +41,6 @@ Flarq (Fast Light Automatic Repeat Request) is a file transfer application that is based on the ARQ specification developed by Paul Schmidt, K9PS. It is capable of transmitting and receiving frames of ARQ data via fldigi. -The fldigi-shell program controls fldigi over HTTP via XML-encoded -remote procedure calls (XML-RPC). It can call any XML-RPC method -exported by fldigi, and also defines some useful commands of its own. - %package doc Summary: PDF User Manual for %{name} @@ -73,6 +69,10 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" LIBS="-lm -lX11 -lpthread" V=1 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/flarq.desktop +# Remove fldigi-shell as it will no longer be installed by default in future +# versions. +rm -f %{buildroot}%{_bindir}/fldigi-shell + %find_lang %{name} # Install user manual. @@ -97,21 +97,21 @@ EOF %files -f %{name}.lang +%if 0%{?rhel} || 0%{?fedora} < 21 +%doc COPYING +%else %license COPYING +%endif %doc AUTHORS ChangeLog README NEWS %{_bindir}/* %{_datadir}/pixmaps/%{name}.xpm %{_datadir}/pixmaps/flarq.xpm %{_mandir}/man1/%{name}.1.gz %{_mandir}/man1/flarq.1.gz -%{_mandir}/man1/%{name}-shell.1.gz %{?fedora:%{_datadir}/appdata/flarq.appdata.xml} %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/flarq.desktop -%{_datadir}/%{name}/NAVTEX_Stations.csv -%{_datadir}/%{name}/ToR-Stats-SHIP.csv -%{_datadir}/%{name}/nsd_bbsss.txt -%{_datadir}/%{name}/station_table.txt +%{_datadir}/%{name}/ %exclude %{_docdir}/%{name}/FLDigi_3.22_Users_Manual.pdf %files doc @@ -119,6 +119,10 @@ EOF %changelog +* Tue May 5 2015 Richard Shaw - 3.22.08-1 +- Update to latest upstream release. +- Update build requirements to use separate xmlrpc library. + * Sat May 02 2015 Kalev Lember - 3.22.07-2 - Rebuilt for GCC 5 C++11 ABI change @@ -128,7 +132,7 @@ EOF * Thu Mar 26 2015 Richard Hughes - 3.22.06-2 - Add an AppData file for the software center -* Sat Mar 22 2015 Richard Shaw - 3.22.06-1 +* Sun Mar 22 2015 Richard Shaw - 3.22.06-1 - Update to latest upstream release. * Tue Jan 13 2015 Richard Shaw - 3.22.05-1 @@ -225,60 +229,3 @@ EOF * Mon Jan 2 2012 Randall J. Berry, N3LRX - 3.21.34-2 - Test Build Against FLTK 1.3 - -* Thu Dec 28 2011 Randall J. Berry - 3.21.34-1 -- Test Build Against FLTK 1.3 -- Remove patches - -* Fri Sep 9 2011 Randall J. Berry - 3.21.14-2 -- Testing apply patches for panel.cxx - -* Fri Sep 9 2011 Randall J. Berry - 3.21.14-1 -- Upstream update to 3.21.14 -- Remove patch applied upstream - -* Sun Jun 12 2011 Randall J. Berry - 3.21.11-4 -- Correct my mistake in update request. - -* Sun Jun 12 2011 Randall J. Berry - 3.21.11-4 -- Upload and build - -* Sun Jun 12 2011 Randall J. Berry - 3.21.11-3 -- Removed --disable-nls temporary fix -- Apply Patch0 by Kamal Mostafa, KA6MAL -- Fixes crash when started (bug #708696) -- Added provides fldigi-shell, flarq - -* Sat Jun 11 2011 Randall J. Berry - 3.21.11-2 -- Upload source to git (F15) -- Build for F15 - -* Sat Jun 11 2011 Randall J. Berry - 3.21.11-1 -- Upstream update (alpha) -- Build with --disable-nls as a temporary measure to prevent crash on startup (bug #708696) -- Temporary disable of i18n (bug #708696) - -* Sat Jun 4 2011 Randall J. Berry - 3.21.10-3 -- Successful local build F14 -- Test build on koji F14 - -* Sat Jun 4 2011 Randall J. Berry - 3.21.10-2 -- Removed patches -- Test build for Rawhide - -* Sat Jun 4 2011 Randall J. Berry - 3.21.10-1 -- Apply upstream patches dup_defines.diff - -* Thu May 26 2011 Randall J. Berry - 3.21.9-3 -- Added Panel.cxx patch1 to fix int error. - -* Thu May 26 2011 Randall J. Berry - 3.21.9-2 -- Added BuildRequires: libXinerama-devel - -* Thu May 26 2011 Randall J. Berry - 3.21.9-1 -- Upstream update 3.21.9 -- Fix broken deps for Rawhide/F16 - -* Thu Mar 24 2011 Randall J. Berry - 3.21.7-1 -- Upstream update 3.21.7 -- Rebiuld fix broken deps on mas rebuild diff --git a/sources b/sources index aa6709d..4dc584a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98861a1a65f07ec9ba00ea4ae9112c7a fldigi-3.22.07.tar.gz +774bec2a5ac83502472906b192064787 fldigi-3.22.08.tar.gz