Merge branch 'epel8' into epel7

.gitignore

@@ -71,3 +71,20 @@ fldigi-3.20.20.tar.gz
 /fldigi-4.1.04.tar.gz
 /fldigi-4.1.05.tar.gz
 /fldigi-4.1.06.tar.gz
+/fldigi-4.1.07.tar.gz
+/fldigi-4.1.08.tar.gz
+/fldigi-4.1.09.tar.gz
+/fldigi-4.1.10.tar.gz
+/fldigi-4.1.11.tar.gz
+/fldigi-4.1.12.tar.gz
+/fldigi-4.1.13.tar.gz
+/flarq-help.pdf
+/fldigi_4.1.13-help.pdf
+/fldigi-4.1.14.tar.gz
+/fldigi-4.1.15.tar.gz
+/fldigi-4.1.17.tar.gz
+/fldigi-4.1.18.tar.gz
+/fldigi-4.1.19.tar.gz
+/fldigi-4.1.20.tar.gz
+/fldigi-4.1.21.tar.gz
+/fldigi-4.1.23.tar.gz

fldigi.spec

@@ -1,33 +1,42 @@
+# For test builds, should be set to 0 for release builds.
+%global alpha 0
+
 Name:           fldigi
-Version:        4.1.06
+Version:        4.1.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Digital modem program for Linux
 
 License:        GPLv3+  
 URL:            http://www.w1hkj.com/Fldigi.html
+%if %{alpha}
+Source0:        http://www.w1hkj.com/alpha/%{name}/%{name}-%{version}.tar.gz
+%else
 Source0:        http://www.w1hkj.com/files/%{name}/%{name}-%{version}.tar.gz
-Source1:        http://www.w1hkj.com/files/%{name}/%{name}-help.pdf
+%endif
-Source2:        http://www.w1hkj.com/files/%{name}/flarq-help.pdf
+
 Source100:      fldigi.appdata.xml
 
+#BuildRequires:  automake autoconf libtool
+
+BuildRequires:  asciidoc
+BuildRequires:  desktop-file-utils
+BuildRequires:  fltk-devel >= 1.3
+BuildRequires:  gettext
 BuildRequires:  gcc gcc-c++
 BuildRequires:  hamlib-devel
-BuildRequires:  fltk-devel >= 1.3
+%{?fedora:BuildRequires:  flxmlrpc-devel}
-%if 0%{?rhel}
+%if 0%{?rhel} < 8
 BuildRequires:  fltk-static libXcursor-devel
 %endif
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
-BuildRequires:  portaudio-devel >= 19-4
 BuildRequires:  libsndfile-devel
-BuildRequires:  desktop-file-utils
 BuildRequires:  libsamplerate-devel
-BuildRequires:  pulseaudio-libs-devel
-BuildRequires:  gettext
 BuildRequires:  libXinerama-devel
-
+BuildRequires:  libudev-devel
-Provides:       bundled(xmlrpc)
+BuildRequires:  make
-
+BuildRequires:  portaudio-devel >= 19-4
+BuildRequires:  pulseaudio-libs-devel
 %if 0%{?fedora}
 # For appstream-util
 BuildRequires:  libappstream-glib
@@ -37,6 +46,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 
@@ -49,21 +60,16 @@ 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}}
+%autosetup -p1 -n %{name}-%{version}
 
 
 %build
-%configure %{?rhel:--enable-static}
+%if 0%{?rhel} && 0%{?rhel} < 8
+%configure --enable-static
+%else
+%configure
+%endif
 make %{?_smp_mflags} CFLAGS="%{optflags}" LIBS="-lm -lX11 -lpthread" V=1
 
 
@@ -83,9 +89,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
@@ -93,6 +96,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
@@ -107,11 +111,106 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
 %{_datadir}/applications/flarq.desktop
 %{_datadir}/%{name}/
 
-%files doc
-%doc fldigi-help.pdf flarq-help.pdf
-
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.23-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jul 20 2022 Richard Shaw <hobbes1069@gmail.com> - 4.1.23-1
+- Update to 4.1.23.
+
+* Wed May 04 2022 Richard Shaw <hobbes1069@gmail.com> - 4.1.21-1
+- Update to 4.1.21.
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.20-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Dec 23 2021 Richard Shaw <hobbes1069@gmail.com> - 4.1.20-5
+- Rebuild for hamlib 4.4.
+
+* Thu Dec 23 2021 Richard Shaw <hobbes1069@gmail.com> - 4.1.20-4
+- f35-build-side-49088
+
+* Thu Dec 23 2021 Richard Shaw <hobbes1069@gmail.com> - 4.1.20-3
+- 36-build-side-49086
+
+* Tue Oct 12 2021 Richard Shaw <hobbes1069@gmail.com> - 4.1.20-2
+- Rebuild for hamlib 4.3.1.
+
+* Thu Aug 05 2021 Richard Shaw <hobbes1069@gmail.com> - 4.1.20-1
+- Update to 4.1.20.
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jun 26 2021 Richard Shaw <hobbes1069@gmail.com> - 4.1.19-1
+- Update to 4.1.19.
+
+* Sun May 30 2021 Richard Shaw <hobbes1069@gmail.com> - 4.1.18-3
+- Rebuild for hamlib 4.2.
+
+* Tue Feb 02 2021 Richard Shaw <hobbes1069@gmail.com> - 4.1.18-2
+- Rebuild for hamlib 4.1.
+
+* Fri Jan 29 2021 Richard Shaw <hobbes1069@gmail.com> - 4.1.18-1
+- Update to 4.1.18.
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Dec 03 2020 Richard Shaw <hobbes1069@gmail.com> - 4.1.17-1
+- Update to 4.1.17.
+
+* Mon Oct 19 2020 Richard Shaw <hobbes1069@gmail.com> - 4.1.15-1
+- Update to 4.1.15.
+
+* Mon Oct 12 2020 Richard Shaw <hobbes1069@gmail.com> - 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 <law@redhat.com> - 4.1.13-4
+- Force C++14 as this code is not C++17 ready
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 11 2020 Richard Shaw <hobbes1069@gmail.com> - 4.1.13-2
+- Add patch to fix various memory leaks and other type issues.
+
+* Tue May 26 2020 Richard Shaw <hobbes1069@gmail.com> - 4.1.13-1
+- Update to 4.1.13.
+
+* Thu Apr 23 2020 Richard Shaw <hobbes1069@gmail.com> - 4.1.12-1
+- Update to 4.1.12.
+
+* Sat Apr 04 2020 Richard Shaw <hobbes1069@gmail.com> - 4.1.11-2
+- Rebuild for hamlib 4.0.
+
+* Thu Apr 02 2020 Richard Shaw <hobbes1069@gmail.com> - 4.1.11-1
+- Update to 4.1.11.
+
+* Wed Apr 01 2020 Richard Shaw <hobbes1069@gmail.com> - 4.1.10-1
+- Update to 4.1.10.
+
+* Tue Mar 31 2020 Richard Shaw <hobbes1069@gmail.com> - 4.1.09-3
+- Rebuild for hamlib 4.
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.09-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 13 2020 Richard Shaw <hobbes1069@gmail.com> - 4.1.09-1
+- Update to 4.1.09.
+
+* Thu Aug 15 2019 Richard Shaw <hobbes1069@gmail.com> - 4.1.08-1
+- Update to 4.1.08.
+
+* Tue Aug 06 2019 Richard Shaw <hobbes1069@gmail.com> - 4.1.07-1
+- Update to 4.1.07.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.06-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Wed Jul 24 2019 Richard Shaw <hobbes1069@gmail.com> - 4.1.06-1
 - Update to 4.1.06.
 

sources

@@ -1 +1 @@
-SHA512 (fldigi-4.1.06.tar.gz) = fc3ef66e9ce8c231af27d17f098e1767ba35038afac124be2a1db846246bf2e6d86ba078cd82e28d73b7389079eff87545c2f3e81bef95c525b90a8886c612be
+SHA512 (fldigi-4.1.23.tar.gz) = c01d579fb23325f097969cbb93bd488c8e0c61ef552097166c902a56ce119d7c20694df5cd76ae9b2cb485d68570720745d961b1f1dd9918c6f466f0441005fb