commit aa4c9396e66bf859cea69f9e0c6a345b56f33ae6 Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Sun Aug 11 20:42:32 2019 +0200 Release 2.2 .gitignore | 1 + dream-2.1.1-use-system-libs.patch | 58 --------------------------------------- dream-2.2-use-system-libs.patch | 23 ++++++++++++++++ dream.spec | 18 ++++++------ sources | 2 +- 5 files changed, 35 insertions(+), 67 deletions(-) --- diff --git a/.gitignore b/.gitignore index 8cbe3d9..e5e6d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dream-2.1.1-svn808.tar.gz +/dream_2.2.orig.tar.gz diff --git a/dream-2.2-use-system-libs.patch b/dream-2.2-use-system-libs.patch new file mode 100644 index 0000000..e4779dd --- /dev/null +++ b/dream-2.2-use-system-libs.patch @@ -0,0 +1,23 @@ +diff --git a/dream.pro b/dream.pro +--- a/dream.pro ++++ b/dream.pro +@@ -3,8 +3,6 @@ + TARGET = dream + OBJECTS_DIR = obj + DEFINES += EXECUTABLE_NAME=$$TARGET +-LIBS += -L$$PWD/lib +-INCLUDEPATH += $$PWD/include + contains(QT_VERSION, ^4\\..*) { + VERSION_MESSAGE = Qt 4 + } +@@ -402,8 +400,8 @@ + LIBS += -lqwt-qt5 + } + !crosscompile { +- exists(/usr/include/qwt/qwt.h) { +- INCLUDEPATH += /usr/include/qwt ++ exists(/usr/include/qt5/qwt/qwt.h) { ++ INCLUDEPATH += /usr/include/qt5/qwt + } + exists(/usr/local/include/qwt/qwt.h) { + INCLUDEPATH += /usr/local/include/qwt diff --git a/dream.spec b/dream.spec index 9d6d82a..4d82dda 100644 --- a/dream.spec +++ b/dream.spec @@ -2,18 +2,18 @@ %global ver_suffix svn808 Name: dream -Version: 2.1.1 -Release: 7%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: A software radio for AM and Digital Radio Mondiale (DRM) License: GPLv2+ URL: https://sourceforge.net/projects/drm/ -Source0: https://downloads.sourceforge.net/project/drm/%{name}/%{version}/%{name}-... +Source0: https://sourceforge.net/projects/drm/files/dream/%{version}/dream_%{versi... Source1: dream.desktop -Patch0: dream-2.1.1-use-system-libs.patch +Patch0: dream-%{version}-use-system-libs.patch BuildRequires: gcc-c++, hamlib-devel, dos2unix, qt5-devel, pulseaudio-libs-devel BuildRequires: libpcap-devel, gpsd-devel, libsndfile-devel, speexdsp-devel, fftw-devel BuildRequires: opus-devel, faad2-devel, qwt-qt5-devel, qt5-qtwebkit-devel -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils, libpcap-devel BuildRequires: faac-devel > 1.29.9.2-3 Requires: hicolor-icon-theme @@ -23,15 +23,14 @@ With Dream, DRM broadcasts can be received with a modified analog receiver (SW, MW, LW) and a PC with a sound card. %prep -%setup -q -n %{name} +%autosetup -n dream-%{version} # convert CRLF to LF dos2unix dream.pro -%patch0 -p1 -b .use-system-libs - %build OUT_PWD="%{_prefix}" %{qmake_qt5} ./dream.pro +%make_build %install %make_install INSTALL_ROOT="%{buildroot}" @@ -54,6 +53,9 @@ desktop-file-install --add-category="Utility" \ %{_mandir}/man1/* %changelog +* Sun Aug 11 2019 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 2.2-1 +- Release 2.2 + * Sat Aug 10 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index dd593f3..529876e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4745a4f03216bc3afda077398d0e5d3b dream-2.1.1-svn808.tar.gz +df3d272ce491aafd7de843c8d9ff5e63 dream_2.2.orig.tar.gz