From ea1219a65deaa37064e443932016622c9211139f Mon Sep 17 00:00:00 2001 From: Richard M. Shaw Date: Sep 03 2013 19:35:54 +0000 Subject: Update to latest bugfix release. --- diff --git a/.gitignore b/.gitignore index f4be962..ef8b899 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ fldigi-3.20.20.tar.gz /fldigi-3.21.68.tar.gz /fldigi.pdf /fldigi-3.21.74.tar.gz +/fldigi-3.21.75.tar.gz diff --git a/fldigi.spec b/fldigi.spec index 5622991..29d28b2 100755 --- a/fldigi.spec +++ b/fldigi.spec @@ -1,5 +1,5 @@ Name: fldigi -Version: 3.21.74 +Version: 3.21.75 Release: 1%{?dist} Summary: Digital modem program for Linux Group: Applications/Communications @@ -18,8 +18,7 @@ BuildRequires: libsndfile-devel BuildRequires: desktop-file-utils BuildRequires: libsamplerate-devel BuildRequires: pulseaudio-libs-devel -# Not all perl depdencies are in EPEL -%if %{?fedora} +%if 0%{?fedora} BuildRequires: xmlrpc-c-devel %endif BuildRequires: gettext @@ -62,18 +61,14 @@ chmod 644 ./src/olivia/olivia.cxx %build %configure -make -k %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS="-lm -lX11 -lpthread" +make -k %{?_smp_mflags} CFLAGS="%{optflags}" LIBS="-lm -lX11 -lpthread" %install -make install DESTDIR=%{buildroot} -desktop-file-install --vendor="" \ ---dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ -$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop \ -$RPM_BUILD_ROOT%{_datadir}/applications/flarq.desktop -# --vendor obsolete per new guidlines but leaving it in because -# this is an existing package with vendor previously installed -# fldigi-shell is cli no .desktop needed +%make_install + +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/flarq.desktop %find_lang %{name} @@ -89,9 +84,7 @@ install -pm 0644 %{SOURCE1} . %{_mandir}/man1/%{name}.1.gz %{_mandir}/man1/flarq.1.gz %{_mandir}/man1/%{name}-shell.1.gz -#attr(0644,root,root) %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop -#%attr(0644,root,root) %{_datadir}/applications/flarq.desktop %{_datadir}/applications/flarq.desktop %{_datadir}/%{name}/NAVTEX_Stations.csv %{_datadir}/%{name}/ToR-Stats-SHIP.csv @@ -103,6 +96,9 @@ install -pm 0644 %{SOURCE1} . %changelog +* Mon Sep 2 2013 Richard Shaw - 3.21.75-1 +- Update to latest bugfix release. + * Tue Aug 27 2013 Richard Shaw - 3.21.74-1 - Update to latest bugfix release. diff --git a/sources b/sources index d55fce0..0cfee56 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -c19011fb63734954cd64f4fccfec3840 fldigi-3.21.74.tar.gz -8ea330c53c30b4307f6881fa7fd73ebc fldigi.pdf +9f6c3d3a6074d31c72e37cc4a28afd77 fldigi-3.21.75.tar.gz