From 93fb13052f5b13ce339f153149c87fc36f0227bf Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Jun 25 2013 09:14:12 +0000
Subject: New version


  Resolves: rhbz#976982
- Defuzzified cmake-modules-fix patch

---

diff --git a/gnuradio-3.6.5-cmake-modules-fix.patch b/gnuradio-3.6.5-cmake-modules-fix.patch
deleted file mode 100644
index a050854..0000000
--- a/gnuradio-3.6.5-cmake-modules-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up gnuradio-3.6.5/CMakeLists.txt.orig gnuradio-3.6.5/CMakeLists.txt
---- gnuradio-3.6.5/CMakeLists.txt.orig	2013-05-26 19:31:51.000000000 +0200
-+++ gnuradio-3.6.5/CMakeLists.txt	2013-06-04 15:29:18.766492710 +0200
-@@ -294,9 +294,13 @@ SET(cmake_configs
-   ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfigVersion.cmake
- )
- 
-+if(NOT CMAKE_MODULES_DIR)
-+   set(CMAKE_MODULES_DIR lib/cmake/gnuradio)
-+endif(NOT CMAKE_MODULES_DIR)
-+
- install(
--  FILES ${cmake_configs} 
--  DESTINATION lib/cmake/gnuradio
-+  FILES ${cmake_configs}
-+  DESTINATION ${CMAKE_MODULES_DIR}
-   COMPONENT "runtime_devel"
- )
- 
diff --git a/gnuradio-3.7.0rc0-cmake-modules-fix.patch b/gnuradio-3.7.0rc0-cmake-modules-fix.patch
new file mode 100644
index 0000000..d4009f3
--- /dev/null
+++ b/gnuradio-3.7.0rc0-cmake-modules-fix.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 161017b..5862273 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -311,9 +311,13 @@ SET(cmake_configs
+   ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfigVersion.cmake
+ )
+ 
++if(NOT CMAKE_MODULES_DIR)
++   set(CMAKE_MODULES_DIR lib/cmake/gnuradio)
++endif(NOT CMAKE_MODULES_DIR)
++
+ install(
+-  FILES ${cmake_configs} 
+-  DESTINATION lib/cmake/gnuradio
++  FILES ${cmake_configs}
++  DESTINATION ${CMAKE_MODULES_DIR}
+   COMPONENT "runtime_devel"
+ )
+ 
diff --git a/gnuradio.spec b/gnuradio.spec
index 138c21e..87efd67 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -14,12 +14,14 @@
 %endif
 %endif
 
+%global alphatag rc0
+
 # For versions not yet on ftp, pull from git
 #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
 
 Name:		gnuradio
-Version:	3.6.5
-Release:	2%{?dist}
+Version:	3.7.0
+Release:	0.1.%{alphatag}%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -27,7 +29,7 @@ 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}.tar.gz
+Source0:	http://gnuradio.org/releases/gnuradio/gnuradio-%{version}%{alphatag}.tar.gz
 # git clone git://gnuradio.org/gnuradio
 # cd gnuradio
 # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \
@@ -51,9 +53,11 @@ 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.6.5-cmake-modules-fix.patch
+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
 
 %description
 GNU Radio is a collection of software that when combined with minimal 
@@ -89,10 +93,11 @@ Requires:	%{name} = %{version}-%{release}
 GNU Radio examples
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{alphatag}
 
 %patch0 -p1 -b .cmake-modules-fix
 %patch1 -p1 -b .bigendian
+%patch2 -p1 -b .build-fix
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
@@ -128,12 +133,18 @@ make %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optfl
 rm -rf %{buildroot}
 pushd build
 make install DESTDIR=%{buildroot}
+popd
 
 # install some more docs
-popd
-mkdir -p %{buildroot}%{_docdir}/%{name}-%{version}
+mv %{buildroot}%{_docdir}/%{name}-%{version}%{alphatag} %{buildroot}%{_docdir}/%{name}-%{version}
 install -m 644 -t %{buildroot}%{_docdir}/%{name}-%{version} COPYING AUTHORS
 
+# remove atsc example (bytecompilation problem)
+# the examples shouldn't be probably bytecompiled,
+# but selective bytecompilation would take a lot of time,
+# thus letting it as is
+rm -rf %{buildroot}%{_datadir}/%{name}/examples/atsc
+
 %clean
 rm -rf %{buildroot}
 
@@ -158,6 +169,7 @@ rm -rf %{buildroot}
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/cmake/volk/*.cmake
 %{_datadir}/cmake/Modules/*.cmake
 
 %files doc
@@ -170,6 +182,11 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Mon Jun 24 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.0-0.1.rc0
+- New version
+  Resolves: rhbz#976982
+- Defuzzified cmake-modules-fix patch
+
 * Wed Jun 12 2013 Dan Horák <dan[at]danny.cz> - 3.6.5-2
 - fix build on big endian arches
 
diff --git a/sources b/sources
index 508eaf5..3d49614 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1bbfa4e5e244f30c9b9b47b9c3fecd8  gnuradio-3.6.5.tar.gz
+0b53c4794d24a816c8a12122fe4eaf7e  gnuradio-3.7.0rc0.tar.gz