Merge branch 'master' into epel7

.gitignore

@@ -64,3 +64,8 @@ fldigi-3.20.20.tar.gz
 /fldigi-4.0.16.tar.gz
 /fldigi-4.0.17.tar.gz
 /fldigi-4.0.18.tar.gz
+/fldigi-4.1.00.tar.gz
+/fldigi-4.1.01.tar.gz
+/fldigi-4.1.02.tar.gz
+/fldigi-4.1.03.tar.gz
+/fldigi-4.1.04.tar.gz

fldigi.spec

@@ -1,12 +1,13 @@
 Name:           fldigi
-Version:        4.0.18
-Release:        2%{?dist}
+Version:        4.1.04
+Release:        1%{?dist}
 Summary:        Digital modem program for Linux
 
 License:        GPLv3+  
 URL:            http://www.w1hkj.com/Fldigi.html
 Source0:        http://www.w1hkj.com/files/%{name}/%{name}-%{version}.tar.gz
-Source1:        http://www.w1hkj.com/files/%{name}/%{name}_4.0_help.pdf
+Source1:        http://www.w1hkj.com/files/%{name}/%{name}-help.pdf
+Source2:        http://www.w1hkj.com/files/%{name}/flarq-help.pdf
 Source100:      fldigi.appdata.xml
 
 BuildRequires:  gcc gcc-c++
@@ -25,7 +26,7 @@ BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  gettext
 BuildRequires:  libXinerama-devel
 
-#BuildRequires:  flxmlrpc-devel >= 0.1.0
+Provides:       bundled(xmlrpc)
 
 %if 0%{?fedora}
 # For appstream-util
@@ -54,17 +55,11 @@ Requires:     %{name} = %{version}-%{release}
 BuildArch:    noarch
 
 %description doc
-PDF User Manual for %{name}.
+PDF User Manual for %{name} and flarq.
 
 
 %prep
-%autosetup -n %{name}-%{version}%{?prerel:.%{prerel}}
-
-# Remove bundled xmlrpc library
-#rm -rf src/xmlrpcpp
-
-# Fix header references to xmlrpcpp
-#find ./ -type f -exec sed -i "s/xmlrpcpp\//flxmlrpc\//g" {} \;
+%autosetup -p1 -n %{name}-%{version}%{?prerel:.%{prerel}}
 
 
 %build
@@ -89,7 +84,7 @@ install -pm 0644 data/fldigi-psk.png \
 %find_lang %{name}
 
 # Copy in the user manual.
-cp %{SOURCE1} .
+cp %{SOURCE1} %{SOURCE2} .
 
 %if 0%{?fedora}
 # Install and validate appdata file
@@ -98,19 +93,6 @@ install %{SOURCE100} -pm 0644 %{buildroot}%{_datadir}/appdata/
 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
 %endif
 
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-
 %files -f %{name}.lang
 %license COPYING
 %doc AUTHORS ChangeLog README NEWS
@@ -126,10 +108,31 @@ fi
 %{_datadir}/%{name}/
 
 %files doc
-%doc fldigi_4.0_help.pdf
+%doc fldigi-help.pdf flarq-help.pdf
 
 
 %changelog
+* Sat Jun 29 2019 Richard Shaw <hobbes1069@gmail.com> - 4.1.04-1
+- Update to 4.1.04.
+
+* Tue Jun 11 2019 Richard Shaw <hobbes1069@gmail.com> - 4.1.03-2
+- Add patch for xmlrpc, fixes RHBZ#1705189.
+
+* Mon Apr 22 2019 Richard Shaw <hobbes1069@gmail.com> - 4.1.03-1
+- Update to 4.1.03.
+
+* Sun Apr 14 2019 Richard Shaw <hobbes1069@gmail.com> - 4.1.02-1
+- Update to 4.1.02.
+
+* Tue Feb 19 2019 Richard Shaw <hobbes1069@gmail.com> - 4.1.01-1
+- Update to 4.1.01.
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.00-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jan 29 2019 Richard Shaw <hobbes1069@gmail.com> - 4.1.00-1
+- Update to 4.1.00.
+
 * Thu Aug 30 2018 Richard Shaw <hobbes1069@gmail.com> - 4.0.18-2
 - Rebuild for hamlib 3.3.
 

sources

@@ -1 +1 @@
-SHA512 (fldigi-4.0.18.tar.gz) = b585845b83b8f108a0aefa108349a73e53378e39c545d426c5846dc451653bcbc13d2239e33e69e6045eaeb605c4ac7dc1ae3e9cc0173962f6e0cb86bc6a4f5c
+SHA512 (fldigi-4.1.04.tar.gz) = fba42a60ed9e524f3387f9911d5734749afa11e941a7d002ad519a5019fafafdb3c4d91416f5b51c73ba3d20bd9c18d3cfb0863bc21ca715d6197b559c56ed25