[gnuradio/f19] Fixed uhd_fft error handling

[Jaroslav Škarvada]

commit 19c86ef5ff011f56f85eb14c6ac2bd97696126e8
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Sep 2 10:42:08 2013 +0200

    Fixed uhd_fft error handling
    
      Resolves: rhbz#1003075

 gnuradio-3.6.5-uhd-fft-err.patch |   18 ++++++++++++++++++
 gnuradio.spec                    |    9 ++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/gnuradio-3.6.5-uhd-fft-err.patch b/gnuradio-3.6.5-uhd-fft-err.patch
new file mode 100644
index 0000000..18164a4
--- /dev/null
+++ b/gnuradio-3.6.5-uhd-fft-err.patch
@@ -0,0 +1,18 @@
+--- 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.spec b/gnuradio.spec
index 0f6173c..930f31b 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -19,7 +19,7 @@
 
 Name:		gnuradio
 Version:	3.6.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -54,6 +54,8 @@ Obsoletes:	grc < 0.80-1
 Patch0:		gnuradio-3.6.5-cmake-modules-fix.patch
 # big endian fix
 Patch1:		gnuradio-3.6.5-bigendian.patch
+# Fix uhd_fft error handling, sent upstream, ticket 590
+Patch2:		gnuradio-3.6.5-uhd-fft-err.patch
 
 %description
 GNU Radio is a collection of software that when combined with minimal 
@@ -93,6 +95,7 @@ GNU Radio examples
 
 %patch0 -p1 -b .cmake-modules-fix
 %patch1 -p1 -b .bigendian
+%patch2 -p1 -b .uhd-fft-err
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
@@ -170,6 +173,10 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Mon Sep  2 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 3.6.5-4
+- Fixed uhd_fft error handling
+  Resolves: rhbz#1003075
+
 * Mon Jun 24 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 3.6.5-3
 - Rebuilt for new uhd
   Resolves: rhbz#977172