Request 5533 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 5533 (accepted)

Update qt-dab to release 4.35

Created by wkazubski almost 3 years ago
In state accepted

Submit qt-dab

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

dab-mini.changes Changed

qt-dab.changes Changed

dab-mini.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package dab-mini
 #
-# Copyright (c) 2014-2021 Wojciech Kazubski <wk@ire.pw.edu.pl>
+# Copyright (c) 2014-2022 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
@@ -16,7 +16,7 @@
 #
 
 %define bname qt-dab
-%define qtdabversion 4.1.1
+%define sversion 4.35
 
 Name:           dab-mini
 Version:        2.0
@@ -24,13 +24,8 @@
 License:        GPL-2.0-or-later
 Summary:        Simple DAB/DAB+ receiver
 Url:            http://www.sdr-j.tk/index.html
-%if 0%{?suse_version}
 Group:          Productivity/Multimedia/Other
-%endif
-%if 0%{?fedora}
-Group:          Applications/Multimedia
-%endif
-Source0:        https://github.com/JvanKatwijk/%{bname}/archive/%{bname}-%{qtdabversion}.tar.gz
+Source0:        https://github.com/JvanKatwijk/%{bname}/archive/refs/tags/%{sversion}.tar.gz#/%{bname}-%{sversion}.tar.gz
 Patch1:         %{bname}-use-qwt6-qt5.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -45,20 +40,10 @@
 BuildRequires:  pkgconfig(samplerate)
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  ImageMagick
-%if 0%{?suse_version}
 BuildRequires:  libusb-1_0-devel
 BuildRequires:  libfaad-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  hicolor-icon-theme
-%endif
-%if 0%{?fedora}
-BuildRequires:  qt-devel > 4
-BuildRequires:  libusb1-devel
-BuildRequires:  faad2-devel
-BuildRequires:  gcc-c++
-BuildRequires:  desktop-file-utils
-%define x_qmake qmake-qt4 
-%endif
 
 %description
 This is the implementation of a -relatively simple DAB/DAB+ receiver.
@@ -68,22 +53,19 @@
 
 
 %prep
-%setup -q -n %{bname}-%{bname}-4.11
+%setup -q -n %{bname}-%{sversion}
 %patch1 -p 1
-#rm devices/sdrplay-handler-v2/mirsdrapi-rsp.h
 
 
 %build
-#qmake-qt5 qt-dab.pro
 cd dab-mini
 %cmake \
     -DAIRSPY=ON \
     -DHACKRF=ON \
     -DRTLSDR=ON \
     -DRTLTCP=ON \
-    -DSDRPLAY=ON \
-    
-make
+    -DSDRPLAY=ON
+%cmake_build
 
 
 %install
@@ -92,15 +74,8 @@
 mkdir -p %{buildroot}%{_bindir}
 mv %{buildroot}/usr/dabMini-2.0 %{buildroot}%{_bindir}/dabMini
 
-%if 0%{?suse_version}
+#install desktop file
 %suse_update_desktop_file -G Qt-DAB -i dabMini AudioVideo Tuner 
-%endif
-%if 0%{?fedora}
-desktop-file-install \
-   --vendor= \
-   --dir %{buildroot}%{_datadir}/applications \
-   %{name}.desktop
-%endif
 
 #create and install icons
 convert %{name}.ico %{name}.png

qt-dab.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package qt-dab
 #
-# Copyright (c) 2014-2021 Wojciech Kazubski <wk@ire.pw.edu.pl>
+# Copyright (c) 2014-2022 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
@@ -16,20 +16,16 @@
 #
 
 %define bname qt-dab
+%define sversion 4.35
 
 Name:           %{bname}
-Version:        4.1.1
+Version:        4.3.5
 Release:        0
 License:        GPL-2.0-or-later
 Summary:        Simple DAB/DAB+ receiver
 Url:            http://www.sdr-j.tk/index.html
-%if 0%{?suse_version}
 Group:          Productivity/Multimedia/Other
-%endif
-%if 0%{?fedora}
-Group:          Applications/Multimedia
-%endif
-Source0:        https://github.com/JvanKatwijk/%{name}/archive/%{bname}-%{version}.tar.gz
+Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{sversion}.tar.gz#/%{name}-%{sversion}.tar.gz
 Patch1:         %{bname}-use-qwt6-qt5.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -44,20 +40,10 @@
 BuildRequires:  pkgconfig(samplerate)
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  ImageMagick
-%if 0%{?suse_version}
 BuildRequires:  libusb-1_0-devel
 BuildRequires:  libfaad-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  hicolor-icon-theme
-%endif
-%if 0%{?fedora}
-BuildRequires:  qt-devel > 4
-BuildRequires:  libusb1-devel
-BuildRequires:  faad2-devel
-BuildRequires:  gcc-c++
-BuildRequires:  desktop-file-utils
-%define x_qmake qmake-qt4 
-%endif
 
 %description
 This is the implementation of a -relatively simple DAB/DAB+ receiver.
@@ -67,39 +53,29 @@
 
 
 %prep
-%setup -q -n %{name}-%{name}-4.11
+%setup -q -n %{name}-%{sversion}
 %patch1 -p 1
-#rm devices/sdrplay-handler-v2/mirsdrapi-rsp.h
 
 
 %build
-#qmake-qt5 qt-dab.pro
 cd dab-maxi
 %cmake \
     -DAIRSPY=ON \
     -DHACKRF=ON \
     -DRTLSDR=ON \
     -DRTLTCP=ON \
-    -DSDRPLAY=ON \
-    
-make
+    -DSDRPLAY=ON
+%cmake_build
 
 
 %install
 cd dab-maxi
 %cmake_install
 mkdir -p %{buildroot}%{_bindir}
-mv %{buildroot}/usr/%{name}-4.11 %{buildroot}%{_bindir}/%{name}
+mv %{buildroot}/usr/%{name}-%{sversion} %{buildroot}%{_bindir}/%{name}
 
-%if 0%{?suse_version}
+#install desktop file
 %suse_update_desktop_file -G Qt-DAB -i %{name} AudioVideo Tuner 
-%endif
-%if 0%{?fedora}
-desktop-file-install \
-   --vendor= \
-   --dir %{buildroot}%{_datadir}/applications \
-   %{name}.desktop
-%endif
 
 #create and install icons
 convert %{bname}.ico %{name}.png

qt-dab-4.1.1.tar.gz -> qt-dab-4.35.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 5533 0

Request History

wkazubski created request almost 3 years ago

Update qt-dab to release 4.35

wkazubski accepted request almost 3 years ago