- up to 2.3.0

diff --git a/gqrx-nopulse.patch b/gqrx-nopulse.patch
index 8e4eff0112498558ce677b8c06706bd9a89be99a..ee23ea0ff09a2e77b0f00ef549154ebf06687116 100644 (file)
--- a/gqrx-nopulse.patch
+++ b/gqrx-nopulse.patch
@@ -1,39 +1,17 @@
---- gqrx-2.2.0.org/gqrx.pro    2013-08-08 21:52:05.000000000 +0200
-+++ gqrx-2.2.0/gqrx.pro        2014-03-01 21:46:56.512501576 +0100
-@@ -26,12 +26,15 @@
- }
+--- gqrx-2.3.0/gqrx.pro~       2014-08-05 21:14:41.000000000 +0200
++++ gqrx-2.3.0/gqrx.pro        2015-06-19 12:30:17.734906712 +0200
+@@ -27,14 +27,6 @@ macx {
+ # enable pkg-config to find dependencies
+ CONFIG += link_pkgconfig
  
- unix:!macx {
--    CONFIG += link_pkgconfig
-+  CONFIG += link_pkgconfig
-+  contains(AUDIO_BACKEND, portaudio): {
-+  } else {
-     packagesExist(libpulse libpulse-simple) {
-         # Comment out to use gr-audio (not recommended with ALSA and Funcube Dongle Pro)
-         AUDIO_BACKEND = pulse
-         message("Gqrx configured with pulseaudio backend")
-     }
-+  }
- }
- 
- RESOURCES += icons.qrc
-@@ -191,6 +194,7 @@
-     contains(AUDIO_BACKEND, pulse): {
-         PKGCONFIG += libpulse libpulse-simple
-     } else {
-+        LIBS += -lportaudio
-         PKGCONFIG += gnuradio-audio
-     }
-     PKGCONFIG += gnuradio-analog \
-@@ -214,11 +218,6 @@
-     LIBS += -lboost_system-mt -lboost_program_options-mt
-     LIBS += -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-audio -lgnuradio-analog
-     LIBS += -lgnuradio-blocks -lgnuradio-filter -lgnuradio-fft -lgnuradio-osmosdr
--
--    # portaudio
--    contains(AUDIO_BACKEND, portaudio): {
--        LIBS    += -lportaudio
+-unix:!macx {
+-    packagesExist(libpulse libpulse-simple) {
+-        # Comment out to use gr-audio (not recommended with ALSA and Funcube Dongle Pro)
+-        AUDIO_BACKEND = pulse
+-        message("Gqrx configured with pulseaudio backend")
 -    }
- }
+-}
+-
+ RESOURCES += icons.qrc \
+     textfiles.qrc
  
- OTHER_FILES += \

diff --git a/gqrx.spec b/gqrx.spec
index 346569130bd179ab83dbfd6ab234522f57f85b13..fb1899ffa0ce30b471a30c6bace067dbe3cce4f6 100644 (file)
--- a/gqrx.spec
+++ b/gqrx.spec
@@ -3,12 +3,12 @@
 #
 Summary:       Software defined radio receiver powered by GNU Radio and Qt
 Name:          gqrx
-Version:       2.2.0
-Release:       7
+Version:       2.3.0
+Release:       1
 License:       GPL v3+
 Group:         Applications/Engineering
-Source0:       http://downloads.sourceforge.net/gqrx/%{name}-%{version}-src.tar.gz
-# Source0-md5: ff771b9c31ee17f704859398362b8cc0
+Source0:       http://downloads.sourceforge.net/gqrx/%{name}-%{version}.tar.xz
+# Source0-md5: 91e8e57998deede2b7e0486c65de31cc
 Patch0:                %{name}-nopulse.patch
 URL:           http://gqrx.dk/
 BuildRequires: QtCore-devel