[gnuradio] New version

[Jaroslav Škarvada]

commit bd36678a92fb46b97733a23ec0b35d6e135753e9
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Thu Oct 25 15:12:54 2012 +0200

    New version
    
      Resolves: rhbz#869840
    - Dropped neon patch (upstreamed)

 gnuradio-3.6.1-neon.patch |   40 ----------------------------------------
 gnuradio.spec             |   23 +++++++++--------------
 sources                   |    2 +-
 3 files changed, 10 insertions(+), 55 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index 7f833e0..37651c5 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -17,12 +17,9 @@
 # For versions not yet on ftp, pull from git
 #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
 
-# For versions published as attachment (strange)
-%global attachment_id 389
-
 Name:		gnuradio
-Version:	3.6.1
-Release:	8%{?dist}
+Version:	3.6.2
+Release:	1%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -30,14 +27,12 @@ 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/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}.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} | \
 # gzip > ../%%{name}-%%{version}.tar.gz
 
-Patch0:		gnuradio-3.6.1-neon.patch
-
 Requires(pre):	shadow-utils
 BuildRequires:	cmake
 BuildRequires:	fftw-devel
@@ -117,7 +112,6 @@ GNU Radio examples
 
 %prep
 %setup -q
-%patch0 -p1 -b .neon
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
@@ -134,6 +128,7 @@ cd build
 -DENABLE_GR_TRELLIS=FORCE -DENABLE_GR_VIDEO_SDL=FORCE \
 -DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \
 -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \
+-DSYSCONFDIR=/etc \
 %{?mfpu_neon} \
 ..
 
@@ -145,11 +140,6 @@ rm -rf %{buildroot}
 cd build
 make install DESTDIR=%{buildroot}
 
-# fix sysconfdir location, preserve previous content
-mkdir -p %{buildroot}/etc/
-cp -a %{buildroot}/usr/etc/* %{buildroot}/etc/
-rm -rf %{buildroot}/usr/etc
-
 %clean
 rm -rf %{buildroot}
 
@@ -185,6 +175,11 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Thu Oct 25 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 3.6.2-1
+- New version
+  Resolves: rhbz#869840
+- Dropped neon patch (upstreamed)
+
 * Fri Oct 19 2012 Rex Dieter <rdieter at fedoraproject.org> 3.6.1-8
 - rebuild (qwt)
 
diff --git a/sources b/sources
index b482809..fed6d24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-162bd70651b6350d09ac45ab95b29004  gnuradio-3.6.1.tar.gz
+beaaa4944e0e0a0fd3752f40a00b6114  gnuradio-3.6.2.tar.gz