From 6ba62d3827d093b3aa910c78e23c4eaee7a6dd54 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 27 Jul 2020 12:16:09 -0600 Subject: [PATCH 01/16] - Avoid ordered pointer comparison against 0 which is an error in C++17 --- linpsk-comparison.patch | 35 +++++++++++++++++++++++++++++++++++ linpsk.spec | 7 ++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 linpsk-comparison.patch diff --git a/linpsk-comparison.patch b/linpsk-comparison.patch new file mode 100644 index 0000000..2ff0723 --- /dev/null +++ b/linpsk-comparison.patch @@ -0,0 +1,35 @@ +diff --git a/gui/crxdisplay.cpp b/gui/crxdisplay.cpp +index 704207d..792876d 100644 +--- a/gui/crxdisplay.cpp ++++ b/gui/crxdisplay.cpp +@@ -78,7 +78,7 @@ bool CRxDisplay::start_process_loop() + Sound = new WaveInput ( -1 ); + else + Sound = new CSound ( settings.serial ); +- if ( Sound <= NULL ) ++ if ( Sound == NULL ) + return false; + + connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_rxdata() ) ); +diff --git a/gui/linpsk.cpp b/gui/linpsk.cpp +index 5c8ff80..d6c6c0a 100644 +--- a/gui/linpsk.cpp ++++ b/gui/linpsk.cpp +@@ -410,7 +410,7 @@ void LinPSK::startTx() + Modulator = new BpskModulator ( 11025, Frequency, TxBuffer ); + break; */ + } +- if ( Sound <= NULL ) // Only create Sound Device once for output ++ if ( Sound == NULL ) // Only create Sound Device once for output + { + if ( settings.DemoMode ) + { +@@ -421,7 +421,7 @@ void LinPSK::startTx() + Sound = new CSound ( settings.serial ); + connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_txdata() ) ); + } +- if ( Sound <= NULL ) ++ if ( Sound == NULL ) + { + QMessageBox::critical ( 0, " Programm Error! LinPsk", "Could not create Sound Device for Output" ); + TxDisplay->TxFunctions->setStatus ( ON ); diff --git a/linpsk.spec b/linpsk.spec index f72b8e1..8deb346 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -15,6 +15,7 @@ Source3: %{name}_64x64.png # Patch asoundrc file for default sound card (device 0) Patch0: linpsk-1.1-3.sound.conf.patch +Patch1: linpsk-comparison.patch BuildRequires: fftw-devel @@ -47,6 +48,7 @@ At the Moment RTTY only supports 45 baud and 1.5 stop-bits. chmod 0644 src/{rttydemodulator.cpp,rttydemodulator.h} %patch0 -p1 -b 3.sound.conf +%patch1 -p1 -b comparison %build %{qmake_qt4} -unix -o Makefile %{name}.pro @@ -88,6 +90,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Mon Jul 27 2020 Jeff Law - 1.3.5-7 +- Avoid ordered pointer comparison against 0 which is an error in C++17 + * Wed Jan 29 2020 Fedora Release Engineering - 1.3.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From fc11d2963cd2463b4c867cb317b3d33f8fccbb01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:07:50 +0000 Subject: [PATCH 02/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index 8deb346..e8ba20f 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -90,6 +90,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.3.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Jeff Law - 1.3.5-7 - Avoid ordered pointer comparison against 0 which is an error in C++17 From 75fb571ccf3eb238fe76eed8c6a57af751c65068 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 03:15:50 +0000 Subject: [PATCH 03/16] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- linpsk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/linpsk.spec b/linpsk.spec index e8ba20f..0512b8f 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -22,6 +22,7 @@ BuildRequires: fftw-devel BuildRequires: qt-devel BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils +BuildRequires: make #Requires: From 87454f5e48ef1cc59638df28ab589c22f811d7c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:32:22 +0000 Subject: [PATCH 04/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index 0512b8f..d23cdde 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -91,6 +91,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.3.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.3.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 51fd54e4f6a8c5b5778c0a00bce002e1d3fbc874 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 12:58:42 +0000 Subject: [PATCH 05/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index d23cdde..9aaa552 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -91,6 +91,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.3.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.3.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3d4b546e5ce866862587ed6412889c4fbc8c945f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 17:52:46 +0000 Subject: [PATCH 06/16] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index 9aaa552..577bbf9 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -91,6 +91,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.3.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.3.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 5aabdcfacfc7de012b01adf8af5aac6d63ddfdba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 19:39:33 +0000 Subject: [PATCH 07/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index 577bbf9..5fc2807 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -91,6 +91,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.3.5-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.3.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 9fc42fa97b008edbf264d47a13d739fceccb9958 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:04:38 +0000 Subject: [PATCH 08/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index 5fc2807..52a3443 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -91,6 +91,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.3.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 1.3.5-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 83921f66489c86932bc48044e5d358aee66d4943 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 12:49:34 +0000 Subject: [PATCH 09/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index 52a3443..04308fa 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -91,6 +91,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.3.5-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.3.5-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From eb0ee5155bbf2232799243dfbb8c61855a476dd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 05:59:51 +0000 Subject: [PATCH 10/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index 04308fa..e95d01b 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -91,6 +91,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.3.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 1.3.5-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 54d76ce9188f5eb8aec691f5bdee0e75ef116159 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 04:22:09 +0000 Subject: [PATCH 11/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index e95d01b..c8f3dba 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -91,6 +91,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.3.5-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.3.5-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 02edd485b03c5cc9e4d8c2695e19230be39d78a9 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 12/16] Eliminate use of obsolete %patchN syntax (#2283636) --- linpsk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linpsk.spec b/linpsk.spec index c8f3dba..02f0e58 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -48,8 +48,8 @@ At the Moment RTTY only supports 45 baud and 1.5 stop-bits. #fix permissions for debuginfo files chmod 0644 src/{rttydemodulator.cpp,rttydemodulator.h} -%patch0 -p1 -b 3.sound.conf -%patch1 -p1 -b comparison +%patch -P0 -p1 -b 3.sound.conf +%patch -P1 -p1 -b comparison %build %{qmake_qt4} -unix -o Makefile %{name}.pro From 530d13e147069aa5b6ec2b3f52164f4015bfb4e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 15:45:50 +0000 Subject: [PATCH 13/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index 02f0e58..1eb00e5 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Psk31 and RTTY program for Linux License: GPLv2+ @@ -91,6 +91,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.3.5-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 1.3.5-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From dd1a4d394eb89ae35665127774ef28ffc3d9fe96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 01:07:19 +0200 Subject: [PATCH 14/16] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- linpsk.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/linpsk.spec b/linpsk.spec index 1eb00e5..28a08e4 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,9 +1,10 @@ Name: linpsk Version: 1.3.5 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Psk31 and RTTY program for Linux -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://linpsk.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Add .desktop file @@ -91,6 +92,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Fri Jul 26 2024 Miroslav Suchý - 1.3.5-18 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 1.3.5-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 40e17129cb32a3e5d3ab464ce0ad59cf25f6d5fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 15:42:26 +0000 Subject: [PATCH 15/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index 28a08e4..f312582 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Psk31 and RTTY program for Linux # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -92,6 +92,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.3.5-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 1.3.5-18 - convert license to SPDX From e129e589c556c7185575f8f7844f3648845ac349 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:43:43 +0000 Subject: [PATCH 16/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- linpsk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linpsk.spec b/linpsk.spec index f312582..f5b640e 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,6 +1,6 @@ Name: linpsk Version: 1.3.5 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Psk31 and RTTY program for Linux # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -92,6 +92,9 @@ find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' %{_libexecdir}/%{name}-bin %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.3.5-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1.3.5-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild