[gnuradio] New version

[Jaroslav Škarvada]

commit bcecd70fcfc17c90bee19829619f8c484a1db2fb
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Jun 12 17:21:57 2012 +0200

    New version
    
      Resolves: rhbz#831187
      Dropped pygtk2-no-x-detect patch (upstreamed)

 gnuradio-3.6.0-pygtk2-no-x-detect.patch |   21 ---------------------
 gnuradio.spec                           |   13 +++++++------
 sources                                 |    2 +-
 3 files changed, 8 insertions(+), 28 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index 9148354..476ee2f 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -5,10 +5,10 @@
 #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
 
 # For versions published as attachment (strange)
-%global attachment_id 326
+%global attachment_id 389
 
 Name:		gnuradio
-Version:	3.6.0
+Version:	3.6.1
 Release:	1%{?dist}
 Summary:	Software defined radio framework
 
@@ -23,9 +23,6 @@ Source0:	http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnura
 # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \
 # gzip > ../%%{name}-%%{version}.tar.gz
 
-# Fix detection of pygtk if there is no running X session, sent upstream
-Patch0:		gnuradio-3.6.0-pygtk2-no-x-detect.patch
-
 Requires(pre):	shadow-utils
 BuildRequires:	cmake
 BuildRequires:	sdcc
@@ -104,7 +101,6 @@ GNU Radio examples
 
 %prep
 %setup -q
-%patch0 -p1 -b .pygtk2-no-x-detect
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
@@ -171,6 +167,11 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Tue Jun 12 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 3.6.1-1
+- New version
+  Resolves: rhbz#831187
+  Dropped pygtk2-no-x-detect patch (upstreamed)
+
 * Mon Apr 23 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 3.6.0-1
 - New version
   Resolves: rhbz#815070
diff --git a/sources b/sources
index eeefcd3..b482809 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82980e6924708221f4bc31446fa87f01  gnuradio-3.6.0.tar.gz
+162bd70651b6350d09ac45ab95b29004  gnuradio-3.6.1.tar.gz