diff --git a/gnuradio-3.7.1-findgnuradio-cmake-fix.patch b/gnuradio-3.7.1-findgnuradio-cmake-fix.patch deleted file mode 100644 index 22cefa9..0000000 --- a/gnuradio-3.7.1-findgnuradio-cmake-fix.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -up gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake.orig gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake ---- gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake.orig 2013-06-30 02:05:51.000000000 +0200 -+++ gnuradio-3.7.1/cmake/Modules/FindGnuradio.cmake 2013-09-04 16:59:08.000000000 +0200 -@@ -43,11 +43,11 @@ function(GR_MODULE EXTVAR PCNAME INCFILE - FIND_PATH( - ${INCVAR_NAME} - NAMES ${INCFILE} -- HINTS $ENV{GNURADIO_RUNTIME_DIR}/include/gnuradio -+ HINTS $ENV{GNURADIO_RUNTIME_DIR}/include - ${PC_INCDIR} -- ${CMAKE_INSTALL_PREFIX}/include/gnuradio -- PATHS /usr/local/include/gnuradio -- /usr/include/gnuradio -+ ${CMAKE_INSTALL_PREFIX}/include -+ PATHS /usr/local/include -+ /usr/include - ) - - # look for libs -@@ -85,24 +85,24 @@ function(GR_MODULE EXTVAR PCNAME INCFILE - - endfunction() - --GR_MODULE(CORE gnuradio-runtime gr_top_block.h gnuradio-runtime) --GR_MODULE(RUNTIME gnuradio-runtime gr_top_block.h gnuradio-runtime) --GR_MODULE(ANALOG gnuradio-analog analog/noise_type.h gnuradio-analog) --GR_MODULE(ATSC gnuradio-atsc atsc_api.h gnuradio-atsc) --GR_MODULE(AUDIO gnuradio-audio audio/sink.h gnuradio-audio) --GR_MODULE(BLOCKS gnuradio-blocks blocks/delay.h gnuradio-blocks) --GR_MODULE(CHANNELS gnuradio-channels channels/channel_model.h gnuradio-channels) --GR_MODULE(DIGITAL gnuradio-digital digital/lfsr.h gnuradio-digital) --GR_MODULE(FEC gnuradio-fec fec/rs.h gnuradio-fec) --GR_MODULE(FFT gnuradio-fft fft/fft.h gnuradio-fft) --GR_MODULE(FILTER gnuradio-filter filter/fir_filter.h gnuradio-filter) --GR_MODULE(NOAA gnuradio-noaa noaa/hrpt.h gnuradio-noaa) --GR_MODULE(PAGER gnuradio-pager noaa/flex_deinterleave.h gnuradio-pager) --GR_MODULE(QTGUI gnuradio-qtgui qtgui/utils.h gnuradio-qtgui) --GR_MODULE(TRELLIS gnuradio-trellis trellis/fsm.h gnuradio-trellis) --GR_MODULE(UHD gnuradio-uhd gr_uhd/usrp_sink.h gnuradio-uhd) --GR_MODULE(VOCODER gnuradio-vocoder vocoder/alaw_encode_sb.h gnuradio-vocoder) --GR_MODULE(WAVELET gnuradio-wavelet wavelet/wavelet_ff.h gnuradio-wavelet) -+GR_MODULE(CORE gnuradio-runtime gnuradio/top_block.h gnuradio-runtime) -+GR_MODULE(RUNTIME gnuradio-runtime gnuradio/top_block.h gnuradio-runtime) -+GR_MODULE(ANALOG gnuradio-analog gnuradio/analog/noise_type.h gnuradio-analog) -+GR_MODULE(ATSC gnuradio-atsc gnuradio/atsc/api.h gnuradio-atsc) -+GR_MODULE(AUDIO gnuradio-audio gnuradio/audio/sink.h gnuradio-audio) -+GR_MODULE(BLOCKS gnuradio-blocks gnuradio/blocks/delay.h gnuradio-blocks) -+GR_MODULE(CHANNELS gnuradio-channels gnuradio/channels/channel_model.h gnuradio-channels) -+GR_MODULE(DIGITAL gnuradio-digital gnuradio/digital/lfsr.h gnuradio-digital) -+GR_MODULE(FEC gnuradio-fec gnuradio/fec/rs.h gnuradio-fec) -+GR_MODULE(FFT gnuradio-fft gnuradio/fft/fft.h gnuradio-fft) -+GR_MODULE(FILTER gnuradio-filter gnuradio/filter/fir_filter.h gnuradio-filter) -+GR_MODULE(NOAA gnuradio-noaa gnuradio/noaa/hrpt.h gnuradio-noaa) -+GR_MODULE(PAGER gnuradio-pager gnuradio/pager/api.h gnuradio-pager) -+GR_MODULE(QTGUI gnuradio-qtgui gnuradio/qtgui/utils.h gnuradio-qtgui) -+GR_MODULE(TRELLIS gnuradio-trellis gnuradio/trellis/fsm.h gnuradio-trellis) -+GR_MODULE(UHD gnuradio-uhd gnuradio/uhd/usrp_sink.h gnuradio-uhd) -+GR_MODULE(VOCODER gnuradio-vocoder gnuradio/vocoder/api.h gnuradio-vocoder) -+GR_MODULE(WAVELET gnuradio-wavelet gnuradio/wavelet/wavelet_ff.h gnuradio-wavelet) - GR_MODULE(PMT gnuradio-pmt pmt/pmt.h gnuradio-pmt) - - diff --git a/gnuradio.spec b/gnuradio.spec index c75a410..f80f946 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -19,7 +19,7 @@ Name: gnuradio Version: 3.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -52,9 +52,6 @@ Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 # 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 @@ -67,6 +64,7 @@ performance wireless devices into software problems. Summary: GNU Radio Group: Applications/Engineering Requires: %{name} = %{version}-%{release} +Requires: cmake Obsoletes: usrp-devel < 3.3.0-1 %description devel @@ -93,7 +91,6 @@ 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 {} \; @@ -116,7 +113,7 @@ cd build -DENABLE_GRC=FORCE -DENABLE-GR_COMEDI=FORCE \ -DENABLE_GR_FCD=FORCE \ -DSYSCONFDIR=%{_sysconfdir} \ --DCMAKE_MODULES_DIR=%{_datadir}/cmake/Modules \ +-DCMAKE_MODULES_DIR=%{_libdir}/cmake/gnuradio \ %{?mfpu_neon} \ .. @@ -142,7 +139,7 @@ install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING rm -rf %{buildroot}%{_datadir}/%{name}/examples/atsc # remove bundled cmake modules, upstream ticket 592 -pushd %{buildroot}%{_datadir}/cmake/Modules && rm -f `ls | sed '/^FindGnuradio.cmake\|^FindUHD.cmake\|^Gr.*\|^Gnuradio.*/ d'` +pushd %{buildroot}%{_libdir}/cmake/gnuradio && rm -f `ls | sed '/^FindUHD.cmake\|^Gr.*\|^Gnuradio.*/ d'` popd %clean @@ -169,8 +166,8 @@ rm -rf %{buildroot} %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc -%{_libdir}/cmake/volk/*.cmake -%{_datadir}/cmake/Modules/*.cmake +%{_libdir}/cmake/volk +%{_libdir}/cmake/gnuradio %files doc %defattr(-,root,root,-) @@ -182,6 +179,9 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Tue Sep 17 2013 Jaroslav Škarvada - 3.7.1-4 +- Moved cmake modules to libdir/cmake + * Wed Sep 4 2013 Jaroslav Škarvada - 3.7.1-3 - Fixed FindGnuradio.cmake (by findgnuradio-cmake-fix patch)