[gnuradio] Fixed FindGnuradio.cmake (by findgnuradio-cmake-fix patch)
Jaroslav Škarvada
jskarvad at fedoraproject.org
Wed Sep 4 15:59:42 UTC 2013
commit 9e800dad9a4f37aeb3f89bccce2aed9aa4357c03
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Wed Sep 4 17:59:30 2013 +0200
Fixed FindGnuradio.cmake (by findgnuradio-cmake-fix patch)
gnuradio.spec | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index 5559659..c75a410 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -19,7 +19,7 @@
Name: gnuradio
Version: 3.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Software defined radio framework
Group: Applications/Engineering
@@ -50,8 +50,11 @@ Requires: numpy, wxPython, scipy, portaudio, python-lxml
Requires: pygtk2, python-cheetah, PyQt4, PyQwt
Obsoletes: usrp < 3.3.0-1
Obsoletes: grc < 0.80-1
-# Fix uhd_fft error handling, sent upstream, ticket 590
+# Fix uhd_fft error handling, sent upstream, upstream ticket 590
Patch0: gnuradio-3.6.5-uhd-fft-err.patch
+# Fix FindGnuradio.cmake to allow compilation of out of tree projects
+# upstream ticket 591
+Patch1: gnuradio-3.7.1-findgnuradio-cmake-fix.patch
%description
GNU Radio is a collection of software that when combined with minimal
@@ -90,6 +93,7 @@ GNU Radio examples
%setup -q
%patch0 -p1 -b .uhd-fft-err
+%patch1 -p1 -b .findgnuradio-cmake-fix
#force regeneration of cached moc output files
find . -name "*_moc.cc" -exec rm {} \;
@@ -137,7 +141,7 @@ install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING
# thus letting it as is
rm -rf %{buildroot}%{_datadir}/%{name}/examples/atsc
-# remove bundled cmake modules
+# remove bundled cmake modules, upstream ticket 592
pushd %{buildroot}%{_datadir}/cmake/Modules && rm -f `ls | sed '/^FindGnuradio.cmake\|^FindUHD.cmake\|^Gr.*\|^Gnuradio.*/ d'`
popd
@@ -178,6 +182,9 @@ rm -rf %{buildroot}
%{_datadir}/gnuradio/examples
%changelog
+* Wed Sep 4 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.1-3
+- Fixed FindGnuradio.cmake (by findgnuradio-cmake-fix patch)
+
* Mon Sep 2 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.1-2
- Do not install bundled cmake modules
More information about the scm-commits
mailing list