diff --git a/.gitignore b/.gitignore index 52b6d38..8698dcd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -linpsk-1.1.tgz -/linpsk-1.2.tgz +linpsk-*.tar.gz 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 c30601e..f5b640e 100644 --- a/linpsk.spec +++ b/linpsk.spec @@ -1,12 +1,12 @@ Name: linpsk -Version: 1.2 -Release: 9%{?dist} +Version: 1.3.5 +Release: 20%{?dist} Summary: Psk31 and RTTY program for Linux -Group: Applications/Communications -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}.tgz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Add .desktop file Source1: %{name}.desktop # Install wrapper @@ -16,13 +16,14 @@ 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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fftw-devel BuildRequires: qt-devel BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils +BuildRequires: make #Requires: @@ -48,7 +49,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 +%patch -P0 -p1 -b 3.sound.conf +%patch -P1 -p1 -b comparison %build %{qmake_qt4} -unix -o Makefile %{name}.pro @@ -60,9 +62,9 @@ mkdir -p %{buildroot}%{_bindir} # Move original binary to libexecdir mkdir -p %{buildroot}/%{_libexecdir}/ -install -m 755 bin/%{name} %{buildroot}%{_libexecdir}/%{name}-bin +install -m 755 %{name} %{buildroot}%{_libexecdir}/%{name}-bin -# Install wrapper script +# Install wrapper script install -p -D -m 0755 %{SOURCE2} %{buildroot}/%{_bindir}/%{name} # Install default sound configuration file @@ -81,11 +83,7 @@ desktop-file-install \ #Remove development files find %{buildroot} -type f -name "*.a" -exec rm -f {} ';' -%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root,-) %doc COPYING ChangeLog README %{_bindir}/%{name} %{_datadir}/pixmaps/%{name}.png @@ -94,6 +92,76 @@ rm -rf %{buildroot} %{_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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.3.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 17 2018 Jaroslav Škarvada - 1.3.5-1 +- New version + Resolves: rhbz#1420142 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 1.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 18919f2..18e4c24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -674c783fd772a532a7b8a107ae69ec1e linpsk-1.2.tgz +SHA512 (linpsk-1.3.5.tar.gz) = cbde48fc202780c45205bff0991ae96f4472d87cf27fbf1a473603a0ffd7a623bb9e6ab899ee8c499ce9bec3856a6cc3a2128f6961ffbe8d0333968c40d0c97f