From 79e313aa4c49b7e456b9e7394d1e5eb98b38b808 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Oct 12 2020 13:25:31 +0000 Subject: Update to 4.1.14. Remove large PDF docs, they can be downloaded seprately. Remove forced C++14 as the fixes patch has been updated to support C++17. --- diff --git a/.gitignore b/.gitignore index 9440210..735e391 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ fldigi-3.20.20.tar.gz /fldigi-4.1.13.tar.gz /flarq-help.pdf /fldigi_4.1.13-help.pdf +/fldigi-4.1.14.tar.gz diff --git a/fldigi.spec b/fldigi.spec index ce269d0..686fa78 100644 --- a/fldigi.spec +++ b/fldigi.spec @@ -1,15 +1,14 @@ Name: fldigi -Version: 4.1.13 -Release: 4%{?dist} +Version: 4.1.14 +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}_%{version}-help.pdf -Source2: http://www.w1hkj.com/files/%{name}/flarq-help.pdf Source100: fldigi.appdata.xml +BuildRequires: asciidoc BuildRequires: gcc gcc-c++ BuildRequires: hamlib-devel BuildRequires: fltk-devel >= 1.3 @@ -35,6 +34,8 @@ BuildRequires: libappstream-glib Provides: flarq = %{version}-%{release} +Obsoletes: fldigi-doc < 4.1.14-1 + %description Fldigi is a modem program which supports most of the digital modes used by ham radio operators today. You can also use the program for calibrating your @@ -47,21 +48,11 @@ 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. -%package doc -Summary: PDF User Manual for %{name} -Requires: %{name} = %{version}-%{release} -BuildArch: noarch - -%description doc -PDF User Manual for %{name} and flarq. - - %prep %autosetup -p1 -n %{name}-%{version}%{?prerel:.%{prerel}} %build -export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" %if 0%{?rhel} && 0%{?rhel} < 8 %configure --enable-static %else @@ -86,9 +77,6 @@ install -pm 0644 data/fldigi-psk.png \ %find_lang %{name} -# Copy in the user manual. -cp %{SOURCE1} %{SOURCE2} . - %if 0%{?fedora} # Install and validate appdata file mkdir -p %{buildroot}%{_datadir}/appdata @@ -96,6 +84,7 @@ install %{SOURCE100} -pm 0644 %{buildroot}%{_datadir}/appdata/ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml %endif + %files -f %{name}.lang %license COPYING %doc AUTHORS ChangeLog README NEWS @@ -110,11 +99,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata. %{_datadir}/applications/flarq.desktop %{_datadir}/%{name}/ -%files doc -%doc fldigi_%{version}-help.pdf flarq-help.pdf - %changelog +* Mon Oct 12 2020 Richard Shaw - 4.1.14-1 +- Update to 4.1.14. +- Remove large PDF docs, they can be downloaded seprately. +- Remove forced C++14 as the fixes patch has been updated to support C++17. + * Tue Aug 18 2020 Jeff Law - 4.1.13-4 - Force C++14 as this code is not C++17 ready diff --git a/sources b/sources index 64163c0..037bea9 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (fldigi-4.1.13.tar.gz) = b116a40989cbb6144265b13c4b7744b783434cb2c6590b0c036734fbb8ba512fa0eaf92e506e3f146f424db3f431a5fef86edc5f4a3fa7c3483527af79e4331e -SHA512 (flarq-help.pdf) = 53483089e90ea524efe5c97cc1bb1542eaae815c8f2de347e5f1b9e78d01c3af08c2ca1afd79d75ea120d12fad15dd3c0bcd03a618cd99c91b83d457f803ecee -SHA512 (fldigi_4.1.13-help.pdf) = eac1dd4a9742f6b7a9bd93c077277220bb340082adde8e70d5cc56308ba967ec65227deaf6dd7476b49b399c78e3eba1638ed9e923f54e7cc7b044f11426a71e +SHA512 (fldigi-4.1.14.tar.gz) = b96a9d724087bacad93b6e729039ab67231ee6ebbd1b082c143e7bfb58f103012f98448f3ea0badabeeb748ed81d6d44e503b71bcb5ee6d0fa8108ab6d029d8d