Request 6119 (accepted)

Overview

Request 6119 (accepted)

Update to release 6.8

Created by wkazubski 11 months ago
In state accepted

Submit qt-dab

Submit package home:wkazubski:test / qt-dab to package home:wkazubski / qt-dab

qt-dab-openSUSE_Tumbleweed.changes -> qt-dab-15.5.changes Changed

@@ -1,21 +1,6 @@
 -------------------------------------------------------------------
-Wed Jan  3 18:57:57 UTC 2024 - Wojciech Kazubski <wk@ire.pw.edu.pl>
-
-- update to release 6.4 (aka 6.40)
-  * Scanning code was largely rewritten and the scan button on the
-    main widget now only controls the visibility of a scan-monitor.
-  * The number of buttons on the main widget is reduced.
-  * The schedule button is moved to the configuration and control
-    widget, the content button, the technical widget button and the
-    mute button are replaced by "clickable labels", resp. the label
-    containing the ensemble name for the content button, the label
-    containing the selected service name for the technical display,
-    and the newly introduced speaker label for the mute button.
-  * The label indicating the computer load disappeared, as well the
-    the label telling the estimated TII. After all, the name of the
-    transmitter is given - if available - on the bottom line of the
-    widget
-- update to release 6.3 (aka 6.30)
+Wed Oct 18 18:38:29 UTC 2023 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
 - update to release 6.2
   * new GUI
   * quite some rewriting of code parts

qt-dab.changes Changed

@@ -1,6 +1,35 @@
 -------------------------------------------------------------------
-Wed Oct 18 18:38:29 UTC 2023 - Wojciech Kazubski <wk@ire.pw.edu.pl>
-
+Mon Nov 11 11:53:54 UTC 2024 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 6.8
+  + The structure of the ini file was (re)designed, and made into
+    clean paragraphs. The ini file for the 6.8 version is named
+    differently. All settings done for older versions have to be
+    redone
+  * Software now records for each channel the service selected
+    and - on re-enetering the channel - will (try to) restart the
+    service.
+- added a patch qt-dab-6.8-use-qwt6-qt5.patch to fix build with
+  Qwt 6.3.0 available for Tumbleweed
+
+-------------------------------------------------------------------
+Wed Jan  3 18:57:57 UTC 2024 - Wojciech Kazubski <wk@ire.pw.edu.pl>
+
+- update to release 6.4 (aka 6.40)
+  * Scanning code was largely rewritten and the scan button on the
+    main widget now only controls the visibility of a scan-monitor.
+  * The number of buttons on the main widget is reduced.
+  * The schedule button is moved to the configuration and control
+    widget, the content button, the technical widget button and the
+    mute button are replaced by "clickable labels", resp. the label
+    containing the ensemble name for the content button, the label
+    containing the selected service name for the technical display,
+    and the newly introduced speaker label for the mute button.
+  * The label indicating the computer load disappeared, as well the
+    the label telling the estimated TII. After all, the name of the
+    transmitter is given - if available - on the bottom line of the
+    widget
+- update to release 6.3 (aka 6.30)
 - update to release 6.2
   * new GUI
   * quite some rewriting of code parts

qt-dab4.changes Changed

qt-dab5.changes Changed

qt-dab-openSUSE_Tumbleweed.spec -> qt-dab-15.5.spec Changed

@@ -17,9 +17,9 @@
 
 %define bname qt-dab
 %define branch qt-dab-s6
-%define version4 4.8
-%define version5 5.5
-%define version6 6.4
+%define version4 4.7
+%define version5 5.4
+%define version6 6.2
 
 Name:           %{bname}
 Version:        %{version6}
@@ -28,10 +28,9 @@
 Summary:        Simple DAB/DAB+ receiver
 Url:            http://www.sdr-j.tk/index.html
 Group:          Productivity/Multimedia/Other
-Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{name}-%{version6}.tar.gz#/%{name}-Qt-DAB-%{version6}0.tar.gz
-Source1:        %{bname}-6.ico
+Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{name}-%{version6}.tar.gz#/%{name}-Qt-DAB-%{version6}.tar.gz
 Patch1:         %{bname}-6.1-use-qwt6-qt5.patch
-BuildRequires:  cmake >= 3.21
+BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libqt5-qtbase-devel
 BuildRequires:  qwt6-qt5-devel >= 6.1
@@ -57,9 +56,8 @@
 
 
 %prep
-%setup -q -n %{name}-Qt-DAB-%{version6}0
+%setup -q -n %{name}-Qt-DAB-%{version6}
 %patch1 -p 1
-chmod a-x README.md AUTHORS COPYING LICENSE 
 
 
 %build
@@ -77,13 +75,13 @@
 cd %{branch}
 %cmake_install
 mkdir -p %{buildroot}%{_bindir}
-mv %{buildroot}/usr/%{name}-%{version}0 %{buildroot}%{_bindir}/%{name}-6
+mv %{buildroot}/usr/%{name}-%{version} %{buildroot}%{_bindir}/%{name}-6
 
 #install desktop file
 %suse_update_desktop_file -G Qt-DAB -i %{name}-6 AudioVideo Tuner 
 
 #create and install icons
-convert %{SOURCE1} %{name}.png
+convert %{bname}-6.ico %{name}.png
 install -Dpm 0644 %{name}-7.png \
     %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 install -Dpm 0644 %{name}-6.png \
@@ -101,6 +99,9 @@
 install -Dpm 0644 %{name}-0.png \
     %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
+#fix docs permissions
+chmod a-x ../README.md
+
 
 %files
 %doc AUTHORS README.md

qt-dab.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package qt-dab
 #
-# Copyright (c) 2014-2023 Wojciech Kazubski <wk@ire.pw.edu.pl>
+# Copyright (c) 2014-2024 Wojciech Kazubski <wk@ire.pw.edu.pl>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,24 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.links2linux.org/
 #
 
-%define bname qt-dab
-%define branch qt-dab-s6
-%define version4 4.7
-%define version5 5.4
-%define version6 6.2
-
-Name:           %{bname}
-Version:        %{version6}
+Name:           qt-dab
+Version:        6.8
 Release:        0
 License:        GPL-2.0-or-later
 Summary:        Simple DAB/DAB+ receiver
 Url:            http://www.sdr-j.tk/index.html
 Group:          Productivity/Multimedia/Other
-Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{name}-%{version6}.tar.gz#/%{name}-Qt-DAB-%{version6}.tar.gz
-Patch1:         %{bname}-6.1-use-qwt6-qt5.patch
+Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch1:         %{name}-6.8-use-qwt6-qt5.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libqt5-qtbase-devel
+BuildRequires:  libqt5-qtmultimedia-devel
 BuildRequires:  qwt6-qt5-devel >= 6.1
 BuildRequires:  pkgconfig(fftw3)
 BuildRequires:  hackrf-devel
@@ -42,11 +37,9 @@
 BuildRequires:  pkgconfig(portaudio-2.0)
 BuildRequires:  pkgconfig(samplerate)
 BuildRequires:  pkgconfig(sndfile)
-BuildRequires:  ImageMagick
 BuildRequires:  libusb-1_0-devel
 BuildRequires:  libfaad-devel
 BuildRequires:  update-desktop-files
-BuildRequires:  hicolor-icon-theme
 
 %description
 This is the implementation of a -relatively simple DAB/DAB+ receiver.
@@ -56,12 +49,16 @@
 
 
 %prep
-%setup -q -n %{name}-Qt-DAB-%{version6}
-%patch1 -p 1
+%autosetup -p1
+
+#fix docs permissions
+chmod a-x AUTHORS
+chmod a-x COPYING
+chmod a-x README.md
 
 
 %build
-cd %{branch}
+cd %{name}-%{version}
 %cmake \
     -DAIRSPY=ON \
     -DHACKRF=ON \
@@ -72,43 +69,29 @@
 
 
 %install
-cd %{branch}
+cd %{name}-%{version}
 %cmake_install
+
+# move binary to /usr/bin and rename it
 mkdir -p %{buildroot}%{_bindir}
-mv %{buildroot}/usr/%{name}-%{version} %{buildroot}%{_bindir}/%{name}-6
-
-#install desktop file
-%suse_update_desktop_file -G Qt-DAB -i %{name}-6 AudioVideo Tuner 
-
-#create and install icons
-convert %{bname}-6.ico %{name}.png
-install -Dpm 0644 %{name}-7.png \
-    %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -Dpm 0644 %{name}-6.png \
-    %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
-install -Dpm 0644 %{name}-5.png \
-    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -Dpm 0644 %{name}-4.png \
-    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-install -Dpm 0644 %{name}-3.png \
-    %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-install -Dpm 0644 %{name}-2.png \
-    %{buildroot}%{_datadir}/icons/hicolor/72x72/apps/%{name}.png
-install -Dpm 0644 %{name}-1.png \
-    %{buildroot}%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
-install -Dpm 0644 %{name}-0.png \
-    %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+mv %{buildroot}/usr/Qt-DAB %{buildroot}%{_bindir}/%{name}-6.8
 
-#fix docs permissions
-chmod a-x ../README.md
+# install desktop file
+%suse_update_desktop_file -G Qt-DAB -i %{name}-6.8 AudioVideo Tuner 
+
+# install icon
+install -Dpm 0644 %{name}-6.8.png %{buildroot}%{_datadir}/pixmaps/%{name}-6.8.png
+
+
+%check
 
 
 %files
 %doc AUTHORS README.md
 %license COPYING
-%{_bindir}/*
-%{_datadir}/applications/%{name}-6.desktop
-%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
+%{_bindir}/%{name}-%{version}
+%{_datadir}/applications/%{name}-6.8.desktop
+%{_datadir}/pixmaps/%{name}-6.8.png
 
 
 %changelog

qt-dab-6.1-use-qwt6-qt5.patch Changed

@@ -1,6 +1,6 @@
 diff -up qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake
 --- qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake.aaaa	2023-09-29 18:55:55.000000000 +0200
-+++ qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake	2023-10-01 08:53:37.775447549 +0200
++++ qt-dab-qt-dab-6.1/qt-dab-s4/cmake/Modules/FindQwt.cmake	2024-11-11 13:29:36.265440550 +0100
 @@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
    /usr/include/qwt5
    /usr/include/qwt6-qt5
@@ -9,9 +9,24 @@
    /opt/local/include/qwt
    /sw/include/qwt
    /usr/local/lib/qwt.framework/Headers
+@@ -45,13 +46,12 @@ if(QWT_INCLUDE_DIRS)
+   set(QWT_VERSION "No Version")
+   string(REGEX MATCH "0-9+.0-9+.0-9+" QWT_VERSION ${QWT_STRING_VERSION})
+   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
+-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
+ 
+   message(STATUS "QWT Version: ${QWT_VERSION}")
+   if(NOT QWT_WRONG_VERSION)
+     set(QWT_FOUND TRUE)
+   else(NOT QWT_WRONG_VERSION)
+-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
++    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
+   endif(NOT QWT_WRONG_VERSION)
+ 
+ endif(QWT_INCLUDE_DIRS)
 diff -up qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake
 --- qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake.aaaa	2023-09-29 18:55:55.000000000 +0200
-+++ qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake	2023-10-01 08:53:37.775447549 +0200
++++ qt-dab-qt-dab-6.1/qt-dab-s5/cmake/Modules/FindQwt.cmake	2024-11-11 13:30:10.869310688 +0100
 @@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
    /usr/include/qwt5
    /usr/include/qwt6-qt5
@@ -20,9 +35,24 @@
    /opt/local/include/qwt
    /sw/include/qwt
    /usr/local/lib/qwt.framework/Headers
+@@ -45,13 +46,12 @@ if(QWT_INCLUDE_DIRS)
+   set(QWT_VERSION "No Version")
+   string(REGEX MATCH "0-9+.0-9+.0-9+" QWT_VERSION ${QWT_STRING_VERSION})
+   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
+-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
+ 
+   message(STATUS "QWT Version: ${QWT_VERSION}")
+   if(NOT QWT_WRONG_VERSION)
+     set(QWT_FOUND TRUE)
+   else(NOT QWT_WRONG_VERSION)
+-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
++    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
+   endif(NOT QWT_WRONG_VERSION)
+ 
+ endif(QWT_INCLUDE_DIRS)
 diff -up qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake.aaaa qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake
---- qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake.aaaa	2023-10-01 08:58:42.871036468 +0200
-+++ qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake	2023-10-01 08:59:12.255355648 +0200
+--- qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake.aaaa	2023-09-29 18:55:55.000000000 +0200
++++ qt-dab-qt-dab-6.1/qt-dab-s6/cmake/Modules/FindQwt.cmake	2024-11-11 13:30:43.166700555 +0100
 @@ -19,6 +19,7 @@ find_path(QWT_INCLUDE_DIRS
    /usr/include/qwt5
    /usr/include/qwt6-qt5
@@ -31,3 +61,18 @@
    /opt/local/include/qwt
    /sw/include/qwt
    /usr/local/lib/qwt.framework/Headers
+@@ -45,13 +46,12 @@ if(QWT_INCLUDE_DIRS)
+   set(QWT_VERSION "No Version")
+   string(REGEX MATCH "0-9+.0-9+.0-9+" QWT_VERSION ${QWT_STRING_VERSION})
+   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
+-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
+ 
+   message(STATUS "QWT Version: ${QWT_VERSION}")
+   if(NOT QWT_WRONG_VERSION)
+     set(QWT_FOUND TRUE)
+   else(NOT QWT_WRONG_VERSION)
+-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
++    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
+   endif(NOT QWT_WRONG_VERSION)
+ 
+ endif(QWT_INCLUDE_DIRS)

qt-dab-6.8-use-qwt6-qt5.patch Added

@@ -0,0 +1,26 @@
+diff -up qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake.aaaa qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake
+--- qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake.aaaa	2024-11-10 14:14:47.000000000 +0100
++++ qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake	2024-11-11 11:51:11.165486510 +0100
+@@ -17,6 +17,7 @@ find_path(QWT_INCLUDE_DIRS
+ 	/usr/include/qwt5
+ 	/usr/include/qwt6-qt5
+ 	/usr/include/qt5/qwt
++	/usr/include/qt5/qwt6
+ 	/opt/local/include/qwt
+ 	/sw/include/qwt
+ 	/usr/local/lib/qwt.framework/Headers
+@@ -50,13 +51,12 @@ if(QWT_INCLUDE_DIRS)
+   set(QWT_VERSION "No Version")
+   string(REGEX MATCH "0-9+.0-9+.0-9+" QWT_VERSION ${QWT_STRING_VERSION})
+   string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
+-  string(COMPARE GREATER ${QWT_VERSION} "6.2.0" QWT_WRONG_VERSION)
+ 
+   message(STATUS "QWT Version: ${QWT_VERSION}")
+   if(NOT QWT_WRONG_VERSION)
+     set(QWT_FOUND TRUE)
+   else(NOT QWT_WRONG_VERSION)
+-    message(STATUS "QWT Version must be >= 5.2 and <= 6.2.0, Found ${QWT_VERSION}")
++    message(STATUS "QWT Version must be >= 5.2, Found ${QWT_VERSION}")
+   endif(NOT QWT_WRONG_VERSION)
+ 
+ endif(QWT_INCLUDE_DIRS)

qt-dab-6.8.tar.gz Added

Build Results
RPM Lint

Refresh

Comments for request 6119 0

Request History

wkazubski created request 11 months ago

Update to release 6.8

wkazubski accepted request 11 months ago