diff --git a/gnuradio-3.2-configure.patch b/gnuradio-3.2-configure.patch new file mode 100644 index 0000000..982f7de --- /dev/null +++ b/gnuradio-3.2-configure.patch @@ -0,0 +1,12 @@ +--- gnuradio-3.2.2/configure.ac 2010-01-20 09:54:08.000000000 +0000 ++++ gnuradio-3.2.2/configure.ac 2010-01-20 09:55:35.000000000 +0000 +@@ -121,7 +121,9 @@ + AC_ENABLE_SHARED dnl do build shared libraries + AC_DISABLE_STATIC dnl don't build static libraries + m4_ifdef([LT_INIT],[LT_INIT],[AC_PROG_LIBTOOL]) ++AC_LANG_PUSH([Fortran]) + GR_FORTRAN ++AC_LANG_POP([Fortran]) + + GR_NO_UNDEFINED dnl do we need the -no-undefined linker flag + GR_SCRIPTING diff --git a/gnuradio.spec b/gnuradio.spec index 2ee43cc..0eee79b 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -1,8 +1,8 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: gnuradio Version: 3.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -12,6 +12,7 @@ Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: 10-usrp.rules Patch0: gnuradio-3.2-libtool.patch +Patch1: gnuradio-3.2-configure.patch Requires(pre): shadow-utils BuildRequires: sdcc @@ -93,6 +94,9 @@ GNU Radio USRP headers %prep %setup -q %patch0 -p1 -b .libtool +%patch1 -p1 -b .configure +#force regeneration of cached moc output files +find . -name "*_moc.cc" -exec rm {} \; %build export PATH=%{_libexecdir}/sdcc:$PATH @@ -100,6 +104,31 @@ autoreconf -i %configure --enable-doxygen --enable-latex-doc --disable-gr-audio-oss --enable-usrp --enable-gnuradio-core --enable-gnuradio-examples sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +mkdir -p gnuradio-core/src/lib/swig/.deps usrp/host/swig/.deps \ + gr-usrp/src/.deps gr-usrp2/src/.deps gr-audio-alsa/src/.deps \ + gr-audio-jack/src/.deps gr-audio-portaudio/src/.deps \ + gr-cvsd-vocoder/src/lib/.deps gr-gsm-fr-vocoder/src/lib/.deps \ + gr-pager/src/.deps gr-radio-astronomy/src/lib/.deps gr-trellis/src/lib/.deps \ + gr-video-sdl/src/.deps gr-qtgui/src/lib/.deps +touch gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_runtime.d \ + gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_general.d \ + gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_gengen.d \ + gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_filter.d \ + gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_io.d \ + gnuradio-core/src/lib/swig/.deps/gnuradio_swig_py_hier.d \ + usrp/host/swig/.deps/usrp_prims.d \ + gr-usrp/src/.deps/usrp_swig.d \ + gr-usrp2/src/.deps/usrp2.d \ + gr-audio-alsa/src/.deps/audio_alsa.d \ + gr-audio-jack/src/.deps/audio_jack.d \ + gr-audio-portaudio/src/.deps/audio_portaudio.d \ + gr-cvsd-vocoder/src/lib/.deps/cvsd_vocoder.d \ + gr-gsm-fr-vocoder/src/lib/.deps/gsm_full_rate.d \ + gr-pager/src/.deps/pager_swig.d \ + gr-radio-astronomy/src/lib/.deps/ra.d \ + gr-trellis/src/lib/.deps/trellis.d \ + gr-video-sdl/src/.deps/video_sdl.d \ + gr-qtgui/src/lib/.deps/qtgui.d make %{?_smp_mflags} %install @@ -123,16 +152,16 @@ getent group usrp >/dev/null || groupadd -r usrp %files %defattr(-,root,root,-) -%{python_sitelib}/gnuradio -%exclude %{python_sitelib}/gnuradio/_usrp2.so -%exclude %{python_sitelib}/gnuradio/usrp* +%{python_sitearch}/gnuradio +%exclude %{python_sitearch}/gnuradio/_usrp2.so +%exclude %{python_sitearch}/gnuradio/usrp* %{_sysconfdir}/gnuradio %{_bindir}/gr_* %{_bindir}/find_usrps %{_bindir}/lsusrp %{_libdir}/lib*.so.* %config(noreplace)%{_sysconfdir}/gnuradio/conf.d/*.conf -%exclude %{python_sitelib}/gnuradio/*.la +%exclude %{python_sitearch}/gnuradio/*.la %files devel %defattr(-,root,root,-) @@ -157,12 +186,12 @@ getent group usrp >/dev/null || groupadd -r usrp %{_bindir}/gpio* %{_datadir}/usrp %{_libdir}/libusrp.so.* -%{python_sitelib}/usrpm -%{python_sitelib}/gnuradio/_usrp2.so -%{python_sitelib}/gnuradio/usrp* +%{python_sitearch}/usrpm +%{python_sitearch}/gnuradio/_usrp2.so +%{python_sitearch}/gnuradio/usrp* %config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp.rules %exclude %{_libdir}/*.la -%exclude %{python_sitelib}/usrpm/*.la +%exclude %{python_sitearch}/usrpm/*.la %files -n usrp-devel %defattr(-,root,root,-) @@ -170,6 +199,9 @@ getent group usrp >/dev/null || groupadd -r usrp %{_includedir}/usrp_* %changelog +* Tue Feb 09 2010 Caolán McNamara - 3.2.2-3 +- Resolves: rhbz#539069 FTBFS + * Fri Jan 22 2010 Rahul Sundaram - 3.2.2-2 - Rebuild for Boost soname bump