Request 5199 (accepted)

dab-mini.changes Added

qt-dab.changes Changed

dab-mini.spec Added

@@ -0,0 +1,140 @@
+#
+# spec file for package qt-dab
+#
+# Copyright (c) 2014-2018 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
+#
+
+%define bname qt-dab
+%define qtdabversion 3.5
+
+Name:           dab-mini
+Version:        1.0
+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}-%{qtdabversion}.tar.gz
+Patch1:         %{bname}-use-qwt6-qt5.patch
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  libqt5-qtbase-devel
+BuildRequires:  qwt6-qt5-devel >= 6.1
+BuildRequires:  pkgconfig(fftw3)
+BuildRequires:  hackrf-devel
+BuildRequires:  pkgconfig(libairspy)
+BuildRequires:  pkgconfig(librtlsdr)
+BuildRequires:  sdrplay-devel
+BuildRequires:  pkgconfig(portaudio-2.0)
+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.
+The receiver supports terrestrial DAB reception with as input either
+the stream from a dabstick or a (prerecorded) file, and it will
+output through the default soundcard.
+
+
+%prep
+%setup -q -n %{bname}-%{bname}-%{qtdabversion}
+%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
+
+
+%install
+cd dab-mini
+%cmake_install
+mkdir -p %{buildroot}%{_bindir}
+mv %{buildroot}/usr/dabMini-%{version} %{buildroot}%{_bindir}/dabMini
+
+%if 0%{?suse_version}
+%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
+install -Dpm 0644 %{name}-8.png \
+	%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+install -Dpm 0644 %{name}-7.png \
+	%{buildroot}%{_datadir}/icons/hicolor/24x24/apps/%{name}.png
+install -Dpm 0644 %{name}-6.png \
+	%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -Dpm 0644 %{name}-5.png \
+	%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -Dpm 0644 %{name}-4.png \
+	%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
+install -Dpm 0644 %{name}-3.png \
+	%{buildroot}%{_datadir}/icons/hicolor/72x72/apps/%{name}.png
+install -Dpm 0644 %{name}-2.png \
+	%{buildroot}%{_datadir}/icons/hicolor/96x96/apps/%{name}.png
+install -Dpm 0644 %{name}-1.png \
+	%{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+install -Dpm 0644 %{name}-0.png \
+	%{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+
+#fix docs permissions
+chmod a-x AUTHORS
+chmod a-x COPYING
+chmod a-x ../README.md
+
+
+%files
+%doc dab-maxi/AUTHORS README.md
+%license dab-maxi/COPYING
+%{_bindir}/dabMini
+%{_datadir}/applications/dabMini.desktop
+%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
+
+
+%changelog

qt-dab.spec Changed

@@ -15,10 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.links2linux.org/
 #
 
-#norootforbuild
+%define bname qt-dab
 
-Name:           qt-dab
-Version:        3.4.1
+Name:           %{bname}
+Version:        3.5
 Release:        0
 License:        GPL-2.0-or-later
 Summary:        Simple DAB/DAB+ receiver
@@ -29,8 +29,8 @@
 %if 0%{?fedora}
 Group:          Applications/Multimedia
 %endif
-Source0:        https://github.com/JvanKatwijk/%{name}/archive/%{name}-%{version}.tar.gz
-Patch1:         %{name}-%{name}-2.0-use-qwt6-qt5.patch
+Source0:        https://github.com/JvanKatwijk/%{name}/archive/%{bname}-%{version}.tar.gz
+Patch1:         %{bname}-use-qwt6-qt5.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libqt5-qtbase-devel
@@ -67,13 +67,14 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{bname}-%{bname}-%{version}
 %patch1 -p 1
-rm devices/sdrplay-handler-v2/mirsdrapi-rsp.h
+#rm devices/sdrplay-handler-v2/mirsdrapi-rsp.h
 
 
 %build
 #qmake-qt5 qt-dab.pro
+cd dab-maxi
 %cmake \
     -DAIRSPY=ON \
     -DHACKRF=ON \
@@ -85,6 +86,7 @@
 
 
 %install
+cd dab-maxi
 %cmake_install
 mkdir -p %{buildroot}%{_bindir}
 mv %{buildroot}/usr/%{name}-%{version} %{buildroot}%{_bindir}/%{name}
@@ -100,7 +102,7 @@
 %endif
 
 #create and install icons
-convert %{name}.ico %{name}.png
+convert %{bname}.ico %{name}.png
 install -Dpm 0644 %{name}-9.png \
 	%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 install -Dpm 0644 %{name}-8.png \
@@ -123,12 +125,12 @@
 #fix docs permissions
 chmod a-x AUTHORS
 chmod a-x COPYING
-chmod a-x README.md
+chmod a-x ../README.md
 
 
 %files
-%doc AUTHORS README.md 
-%license COPYING 
+%doc dab-maxi/AUTHORS README.md
+%license dab-maxi/COPYING
 %{_bindir}/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png

qt-dab-qt-dab-2.0-use-qwt6-qt5.patch Deleted

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

@@ -0,0 +1,22 @@
+diff -up qt-dab/dab-maxi/cmake/Modules/FindQwt.cmake.qwt6qt5 qt-dab/dab-maxi/cmake/Modules/FindQwt.cmake
+--- qt-dab/dab-maxi/cmake/Modules/FindQwt.cmake.qwt6qt5	2018-07-21 20:22:55.000000000 +0200
++++ qt-dab/dab-maxi/cmake/Modules/FindQwt.cmake	2018-07-21 20:23:33.000000000 +0200
+@@ -19,6 +19,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
+diff -up qt-dab/dab-mini/cmake/Modules/FindQwt.cmake.qwt6qt5 qt-dab/dab-mini/cmake/Modules/FindQwt.cmake
+--- qt-dab/dab-mini/cmake/Modules/FindQwt.cmake.qwt6qt5	2018-07-21 20:22:55.000000000 +0200
++++ qt-dab/dab-mini/cmake/Modules/FindQwt.cmake	2018-07-21 20:23:33.000000000 +0200
+@@ -19,6 +19,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

_service Changed

Overview

Request 5199 (accepted)

Request History