[gnuradio] New version

[Jaroslav Škarvada]

commit 257702638ed194f83f5ecb886e2023e316b0b22e
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Apr 23 17:29:42 2012 +0200

    New version
    
      Resolves: rhbz#815070
    - Dropped ARM patch (not used in new buildsystem)
    - Fixed pygtk detection (pygtk2-no-x-detect patch)

 gnuradio-3.6.0-pygtk2-no-x-detect.patch |   21 +++++++++++
 gnuradio-disable-arm-opt.patch          |   59 -------------------------------
 gnuradio.spec                           |   54 ++++++++++++++++------------
 sources                                 |    2 +-
 4 files changed, 53 insertions(+), 83 deletions(-)
---
diff --git a/gnuradio-3.6.0-pygtk2-no-x-detect.patch b/gnuradio-3.6.0-pygtk2-no-x-detect.patch
new file mode 100644
index 0000000..d17ba83
--- /dev/null
+++ b/gnuradio-3.6.0-pygtk2-no-x-detect.patch
@@ -0,0 +1,21 @@
+diff -up gnuradio-3.6.0/cmake/Modules/GrPython.cmake.orig gnuradio-3.6.0/cmake/Modules/GrPython.cmake
+--- gnuradio-3.6.0/cmake/Modules/GrPython.cmake.orig	2012-04-21 21:00:33.000000000 +0200
++++ gnuradio-3.6.0/cmake/Modules/GrPython.cmake	2012-04-23 15:13:49.227149681 +0200
+@@ -76,12 +76,11 @@ macro(GR_PYTHON_CHECK_MODULE desc mod cm
+     execute_process(
+         COMMAND ${PYTHON_EXECUTABLE} -c "
+ #########################################
+-try: import ${mod}
+-except:
+-    try: ${mod}
+-    except: exit(-1)
+-try: assert ${cmd}
+-except: exit(-1)
++try:
++    import ${mod}
++    assert ${cmd}
++except ImportError, AssertionError: exit(-1)
++except: pass
+ #########################################"
+         RESULT_VARIABLE ${have}
+     )
diff --git a/gnuradio.spec b/gnuradio.spec
index 1132516..9148354 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -5,10 +5,10 @@
 #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
 
 # For versions published as attachment (strange)
-%global attachment_id 317
+%global attachment_id 326
 
 Name:		gnuradio
-Version:	3.5.3.1
+Version:	3.6.0
 Release:	1%{?dist}
 Summary:	Software defined radio framework
 
@@ -23,11 +23,11 @@ Source0:	http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnura
 # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \
 # gzip > ../%%{name}-%%{version}.tar.gz
 
-# we actually disable ARM optimisations so it actually compiles on ARM. The compiler and the 
-# Fedora rpm compiler options do a much better job of sorting this out
-Patch0:		gnuradio-disable-arm-opt.patch
+# 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
 BuildRequires:	fftw-devel
 BuildRequires:	cppunit-devel
@@ -104,34 +104,38 @@ GNU Radio examples
 
 %prep
 %setup -q
-%patch0 -p1 -b .disable-arm-opts
+%patch0 -p1 -b .pygtk2-no-x-detect
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
 
 %build
-#./bootstrap
-#enabling deps tracking is workaround to build
-%configure --enable-dependency-tracking --enable-python --enable-doxygen \
---enable-dot --enable-volk --enable-gruel --enable-gnuradio-core \
---enable-gr-msdd6000 --enable-gr-audio --enable-gr-atsc \
---enable-gr-cvsd-vocoder --enable-gr-gpio --enable-gr-uhd \
---enable-gr-gsm-fr-vocoder --enable-gr-noaa --enable-gr-pager \
---enable-gr-radar-pager --enable-gr-radar-mono --enable-gr-radio-astronomy \
---enable-gr-trellis --enable-gr-video-sdl --enable-gr-wxgui \
---enable-gr-sounder --enable-gr-utils --enable-gnuradio-examples \
---enable-grc --enable-docs \
---with-boost-libdir=%{_libdir}
-
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+mkdir build
+cd build
+%cmake -DENABLE_PYTHON=FORCE -DENABLE_DOXYGEN=FORCE \
+-DENABLE_VOLK=FORCE -DENABLE_GRUEL=FORCE \
+-DENABLE_GR_CORE=FORCE \
+-DENABLE_GR_AUDIO=FORCE -DENABLE_GR_ATSC=FORCE \
+-DENABLE_GR_VOCODER=FORCE -DENABLE_GR_UHD=FORCE \
+-DENABLE_GR_NOAA=FORCE -DENABLE_GR_PAGER=FORCE \
+-DENABLE_GR_TRELLIS=FORCE -DENABLE_GR_VIDEO_SDL=FORCE \
+-DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \
+-DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \
+..
 
 # make with -j1 and compile without strict-aliasing
 make %{?my_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
 
 %install
 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}
 
@@ -147,17 +151,15 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio
 %config(noreplace) %{_sysconfdir}/gnuradio/conf.d/*.conf
 %exclude %{_datadir}/gnuradio/examples
-%exclude %{python_sitearch}/gnuradio/*.la
 %exclude %{_docdir}/%{name}-%{version}/html
 %exclude %{_docdir}/%{name}-%{version}/xml
-%doc ChangeLog NEWS INSTALL COPYING AUTHORS
+%doc README README.hacking COPYING AUTHORS
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
-%exclude %{_libdir}/*.la
 
 %files doc
 %defattr(-,root,root,-)
@@ -169,6 +171,12 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Mon Apr 23 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 3.6.0-1
+- New version
+  Resolves: rhbz#815070
+- Dropped ARM patch (not used in new buildsystem)
+- Fixed pygtk detection (pygtk2-no-x-detect patch)
+
 * Wed Apr 18 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 3.5.3.1-1
 - New version
   Resolves: rhbz#813725
diff --git a/sources b/sources
index cf04848..eeefcd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b7ce62b76f1e91ccc7228a72d9614f7  gnuradio-3.5.3.1.tar.gz
+82980e6924708221f4bc31446fa87f01  gnuradio-3.6.0.tar.gz