diff --git a/.gitignore b/.gitignore index 3cd4f8b..565b291 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ fldigi-3.20.20.tar.gz /fldigi-3.23.18.tar.gz /fldigi-3.23.19.tar.gz /fldigi-3.23.20.tar.gz +/fldigi-4.0.2.tar.gz diff --git a/fldigi-help.pdf b/fldigi-help.pdf deleted file mode 100644 index 6eee624..0000000 Binary files a/fldigi-help.pdf and /dev/null differ diff --git a/fldigi.spec b/fldigi.spec index 3f07d32..565faa4 100644 --- a/fldigi.spec +++ b/fldigi.spec @@ -1,18 +1,24 @@ -#global prerel 06 +#global prerel 6 Name: fldigi -Version: 3.23.20 +Version: 4.0.2 %if 0%{?prerel} -Release: 2%{?dist} +Release: 0.%{?prerel}%{?dist} %else -Release: 2%{?dist} +Release: 1%{?dist} %endif Summary: Digital modem program for Linux License: GPLv3+ URL: http://www.w1hkj.com/Fldigi.html -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?prerel:.%{prerel}}.tar.gz -Source1: http://downloads.sourceforge.net/%{name}/%{name}-help.pdf + +%if ! 0%{?prerel} +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +%else +Source0: http://www.w1hkj.com/alpha/%{name}/%{name}-%{version}%{?prerel:.%{prerel}}.tar.gz +%endif + +Source1: http://www.w1hkj.com/files/%{name}/%{name}_4.0_help.pdf Source100: fldigi.appdata.xml BuildRequires: hamlib-devel @@ -63,7 +69,7 @@ PDF User Manual for %{name}. %prep -%setup -q -n %{name}-%{version}%{?prerel:.%{prerel}} +%autosetup -n %{name}-%{version}%{?prerel:.%{prerel}} # Remove bundled xmlrpc library #rm -rf src/xmlrpcpp @@ -93,9 +99,8 @@ install -pm 0644 data/fldigi-psk.png \ %find_lang %{name} -# Install user manual. -mkdir -p %{buildroot}%{_docdir}/%{name} -install -pm 0644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}/ +# Copy in the user manual. +cp %{SOURCE1} . %if 0%{?fedora} # Install and validate appdata file @@ -130,13 +135,15 @@ fi %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/flarq.desktop %{_datadir}/%{name}/ -%exclude %{_docdir}/%{name}/fldigi-help.pdf %files doc -%{_docdir}/%{name}/fldigi-help.pdf +%doc fldigi_4.0_help.pdf %changelog +* Fri Apr 14 2017 Richard Shaw - 4.0.2-1 +- Update to latest upstream release. + * Fri Feb 10 2017 Fedora Release Engineering - 3.23.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 7aced41..dcb2f10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fldigi-3.23.20.tar.gz) = 78c2d85eb8fb091f386c4680a8928635a8e81e97175755446dc30a7934a5caf96adacd8ab3722275bc7557913cb9372004c98e265dc46222ba3a54090187fc25 +SHA512 (fldigi-4.0.2.tar.gz) = 64834871279a9921e1942199655b92b91d5ba3a9ef109a9d540b49673c5f52e4676c23cb5ad405311a831204a7dfda32cb44416101b49ef8533497473215e9d3