[gnuradio] New version

[Jaroslav Škarvada]

commit 51685e0b44d0c3e19cd986379c591c5d7ade6699
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Sep 2 10:47:36 2013 +0200

    New version
    
      Resolves: rhbz#1003319
    - Dropped cmake-modules-fix, bigendian, build-fix patches (upstreamed)
    - Fixed uhd_fft error handling
      Resolves: rhbz#1003075

 gnuradio-3.6.5-bigendian.patch            |   21 ------------------
 gnuradio-3.7.0rc0-build-fix.patch         |   11 ---------
 gnuradio-3.7.0rc0-cmake-modules-fix.patch |   20 -----------------
 gnuradio.spec                             |   33 ++++++++++++++---------------
 sources                                   |    2 +-
 5 files changed, 17 insertions(+), 70 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index ab33ba6..6c75bba 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -14,14 +14,12 @@
 %endif
 %endif
 
-%global alphatag rc0
-
 # For versions not yet on ftp, pull from git
 #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
 
 Name:		gnuradio
-Version:	3.7.0
-Release:	0.5.%{alphatag}%{?dist}
+Version:	3.7.1
+Release:	1%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -29,7 +27,8 @@ License:	GPLv3
 URL:		http://www.gnuradio.org
 #Source0:	ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%%{version}.tar.gz
 #Source0:	http://gnuradio.org/redmine/attachments/download/%%{attachment_id}/gnuradio-%%{version}.tar.gz
-Source0:	http://gnuradio.org/releases/gnuradio/gnuradio-%{version}%{alphatag}.tar.gz
+#Source0:	http://gnuradio.org/releases/gnuradio/gnuradio-%{version}%{alphatag}.tar.gz
+Source0:	http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz
 # git clone git://gnuradio.org/gnuradio
 # cd gnuradio
 # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \
@@ -51,13 +50,8 @@ Requires:	numpy, wxPython, scipy, portaudio, python-lxml
 Requires:	pygtk2, python-cheetah, PyQt4, PyQwt
 Obsoletes:	usrp < 3.3.0-1
 Obsoletes:	grc < 0.80-1
-# Make cmake modules installation directory configurable,
-# patch sent upstream, ticket 548
-Patch0:		gnuradio-3.7.0rc0-cmake-modules-fix.patch
-# big endian fix
-Patch1:		gnuradio-3.6.5-bigendian.patch
-# patch sent upstream
-Patch2:		gnuradio-3.7.0rc0-build-fix.patch
+# Fix uhd_fft error handling, sent upstream, ticket 590
+Patch0:		gnuradio-3.6.5-uhd-fft-err.patch
 
 %description
 GNU Radio is a collection of software that when combined with minimal 
@@ -93,11 +87,9 @@ Requires:	%{name} = %{version}-%{release}
 GNU Radio examples
 
 %prep
-%setup -q -n %{name}-%{version}%{alphatag}
+%setup -q
 
-%patch0 -p1 -b .cmake-modules-fix
-%patch1 -p1 -b .bigendian
-%patch2 -p1 -b .build-fix
+%patch0 -p1 -b .uhd-fft-err
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
@@ -141,7 +133,7 @@ ln -s GnuradioConfig.cmake FindGnuradio.cmake
 popd
 
 # install some more docs
-mv %{buildroot}%{_docdir}/%{name}-%{version}%{alphatag} %{buildroot}%{_docdir}/%{name}
+mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name}
 install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING AUTHORS
 
 # remove atsc example (bytecompilation problem)
@@ -187,6 +179,13 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Mon Sep  2 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.1-1
+- New version
+  Resolves: rhbz#1003319
+- Dropped cmake-modules-fix, bigendian, build-fix patches (upstreamed)
+- Fixed uhd_fft error handling
+  Resolves: rhbz#1003075
+
 * Tue Aug  6 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.0-0.5.rc0
 - Used unversioned doc directory
   Resolves: rhbz#993794
diff --git a/sources b/sources
index 3d49614..2776062 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b53c4794d24a816c8a12122fe4eaf7e  gnuradio-3.7.0rc0.tar.gz
+6c5e67da6ed8724dd900d8e343b64be4  gnuradio-3.7.1.tar.gz