From aad5da401dfca0a3a3c70cf7046680b8c7154bb9 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Sep 17 2013 16:05:47 +0000
Subject: Fixed defaults to use libdir for cmake modules (by cmake-libdir patch)


- Defuzzified uhd-fft-err patch

---

diff --git a/gnuradio-3.6.5-uhd-fft-err.patch b/gnuradio-3.6.5-uhd-fft-err.patch
deleted file mode 100644
index 18164a4..0000000
--- a/gnuradio-3.6.5-uhd-fft-err.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/gr-uhd/apps/uhd_fft	2013-06-24 13:37:11.000000000 +0200
-+++ b/gr-uhd/apps/uhd_fft	2013-09-02 10:13:17.039408121 +0200
-@@ -334,8 +334,13 @@
- 
- 
- def main ():
--    app = stdgui2.stdapp(app_top_block, "UHD FFT", nstatus=1)
--    app.MainLoop()
-+    try:
-+        app = stdgui2.stdapp(app_top_block, "UHD FFT", nstatus=1)
-+        app.MainLoop()
-+
-+    except RuntimeError, e:
-+        print e
-+        sys.exit(1)
- 
- if __name__ == '__main__':
-     main ()
diff --git a/gnuradio-3.7.1-cmake-libdir.patch b/gnuradio-3.7.1-cmake-libdir.patch
new file mode 100644
index 0000000..ef6d704
--- /dev/null
+++ b/gnuradio-3.7.1-cmake-libdir.patch
@@ -0,0 +1,12 @@
+diff -up gnuradio-3.7.1/CMakeLists.txt.orig gnuradio-3.7.1/CMakeLists.txt
+--- gnuradio-3.7.1/CMakeLists.txt.orig	2013-08-29 19:17:16.000000000 +0200
++++ gnuradio-3.7.1/CMakeLists.txt	2013-09-17 17:53:44.518199207 +0200
+@@ -312,7 +312,7 @@ SET(cmake_configs
+ )
+ 
+ if(NOT CMAKE_MODULES_DIR)
+-   set(CMAKE_MODULES_DIR lib/cmake/gnuradio)
++   set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake/gnuradio)
+ endif(NOT CMAKE_MODULES_DIR)
+ 
+ # Install all other cmake files into same directory
diff --git a/gnuradio-3.7.1-uhd-fft-err.patch b/gnuradio-3.7.1-uhd-fft-err.patch
new file mode 100644
index 0000000..4508121
--- /dev/null
+++ b/gnuradio-3.7.1-uhd-fft-err.patch
@@ -0,0 +1,20 @@
+diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft
+index c1ccc33..41da61a 100755
+--- a/gr-uhd/apps/uhd_fft
++++ b/gr-uhd/apps/uhd_fft
+@@ -336,8 +336,13 @@ class app_top_block(stdgui2.std_top_block):
+ 
+ 
+ def main ():
+-    app = stdgui2.stdapp(app_top_block, "UHD FFT", nstatus=1)
+-    app.MainLoop()
++    try:
++        app = stdgui2.stdapp(app_top_block, "UHD FFT", nstatus=1)
++        app.MainLoop()
++
++    except RuntimeError, e:
++        print e
++        sys.exit(1)
+ 
+ if __name__ == '__main__':
+     main ()
diff --git a/gnuradio.spec b/gnuradio.spec
index f80f946..9d71d81 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -19,7 +19,7 @@
 
 Name:		gnuradio
 Version:	3.7.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -51,7 +51,9 @@ Requires:	pygtk2, python-cheetah, PyQt4, PyQwt
 Obsoletes:	usrp < 3.3.0-1
 Obsoletes:	grc < 0.80-1
 # Fix uhd_fft error handling, sent upstream, upstream ticket 590
-Patch0:		gnuradio-3.6.5-uhd-fft-err.patch
+Patch0:		gnuradio-3.7.1-uhd-fft-err.patch
+# Fix cmake files location, upstream ticket 591
+Patch1:		gnuradio-3.7.1-cmake-libdir.patch
 
 %description
 GNU Radio is a collection of software that when combined with minimal 
@@ -91,6 +93,7 @@ GNU Radio examples
 %setup -q
 
 %patch0 -p1 -b .uhd-fft-err
+%patch1 -p1 -b .cmake-libdir
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
@@ -113,7 +116,6 @@ cd build
 -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \
 -DENABLE_GR_FCD=FORCE \
 -DSYSCONFDIR=%{_sysconfdir} \
--DCMAKE_MODULES_DIR=%{_libdir}/cmake/gnuradio \
 %{?mfpu_neon} \
 ..
 
@@ -179,6 +181,10 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Tue Sep 17 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.1-5
+- Fixed defaults to use libdir for cmake modules (by cmake-libdir patch)
+- Defuzzified uhd-fft-err patch
+
 * Tue Sep 17 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.1-4
 - Moved cmake modules to libdir/cmake