From 51685e0b44d0c3e19cd986379c591c5d7ade6699 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Sep 02 2013 08:47:36 +0000 Subject: New version Resolves: rhbz#1003319 - Dropped cmake-modules-fix, bigendian, build-fix patches (upstreamed) - Fixed uhd_fft error handling Resolves: rhbz#1003075 --- diff --git a/gnuradio-3.6.5-bigendian.patch b/gnuradio-3.6.5-bigendian.patch deleted file mode 100644 index 7f1bb15..0000000 --- a/gnuradio-3.6.5-bigendian.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up gnuradio-3.6.5/gr-blocks/lib/wavfile.cc.bigendian gnuradio-3.6.5/gr-blocks/lib/wavfile.cc ---- gnuradio-3.6.5/gr-blocks/lib/wavfile.cc.bigendian 2013-06-12 13:41:54.000000000 +0200 -+++ gnuradio-3.6.5/gr-blocks/lib/wavfile.cc 2013-06-12 13:42:22.000000000 +0200 -@@ -38,14 +38,14 @@ namespace gr { - // Define host to/from worknet (little endian) short and long - #ifdef BOOST_BIG_ENDIAN - -- static inline uint16_t __wav_bs16(uint16_t x) -+ static inline uint16_t __gri_wav_bs16(uint16_t x) - { - return (x>>8) | (x<<8); - } - -- static inline uint32_t __wav_bs32(uint32_t x) -+ static inline uint32_t __gri_wav_bs32(uint32_t x) - { -- return (uint32_t(__wav_bs16(uint16_t(x&0xfffful)))<<16) | (__wav_bs16(uint16_t(x>>16))); -+ return (uint32_t(__gri_wav_bs16(uint16_t(x&0xfffful)))<<16) | (__gri_wav_bs16(uint16_t(x>>16))); - } - - #define htowl(x) __gri_wav_bs32(x) diff --git a/gnuradio-3.7.0rc0-build-fix.patch b/gnuradio-3.7.0rc0-build-fix.patch deleted file mode 100644 index a2a3f3b..0000000 --- a/gnuradio-3.7.0rc0-build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h.orig3 gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h ---- gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h.orig3 2013-06-24 21:55:16.076417510 +0200 -+++ gnuradio-3.7.0rc0/gr-channels/lib/flat_fader_impl.h 2013-06-24 21:55:31.534171476 +0200 -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - #include - #include diff --git a/gnuradio-3.7.0rc0-cmake-modules-fix.patch b/gnuradio-3.7.0rc0-cmake-modules-fix.patch deleted file mode 100644 index d4009f3..0000000 --- a/gnuradio-3.7.0rc0-cmake-modules-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 ab33ba6..6c75bba 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -14,14 +14,12 @@ %endif %endif -%global alphatag rc0 - # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a Name: gnuradio -Version: 3.7.0 -Release: 0.5.%{alphatag}%{?dist} +Version: 3.7.1 +Release: 1%{?dist} Summary: Software defined radio framework Group: Applications/Engineering @@ -29,7 +27,8 @@ 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}%{alphatag}.tar.gz +#Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}%{alphatag}.tar.gz +Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ @@ -51,13 +50,8 @@ Requires: numpy, wxPython, scipy, portaudio, python-lxml Requires: pygtk2, python-cheetah, PyQt4, PyQwt 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.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 +# Fix uhd_fft error handling, sent upstream, ticket 590 +Patch0: gnuradio-3.6.5-uhd-fft-err.patch %description GNU Radio is a collection of software that when combined with minimal @@ -93,11 +87,9 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q -n %{name}-%{version}%{alphatag} +%setup -q -%patch0 -p1 -b .cmake-modules-fix -%patch1 -p1 -b .bigendian -%patch2 -p1 -b .build-fix +%patch0 -p1 -b .uhd-fft-err #force regeneration of cached moc output files find . -name "*_moc.cc" -exec rm {} \; @@ -141,7 +133,7 @@ ln -s GnuradioConfig.cmake FindGnuradio.cmake popd # install some more docs -mv %{buildroot}%{_docdir}/%{name}-%{version}%{alphatag} %{buildroot}%{_docdir}/%{name} +mv %{buildroot}%{_docdir}/%{name}-%{version} %{buildroot}%{_docdir}/%{name} install -m 644 -t %{buildroot}%{_docdir}/%{name} COPYING AUTHORS # remove atsc example (bytecompilation problem) @@ -187,6 +179,13 @@ rm -rf %{buildroot} %{_datadir}/gnuradio/examples %changelog +* Mon Sep 2 2013 Jaroslav Škarvada - 3.7.1-1 +- New version + Resolves: rhbz#1003319 +- Dropped cmake-modules-fix, bigendian, build-fix patches (upstreamed) +- Fixed uhd_fft error handling + Resolves: rhbz#1003075 + * Tue Aug 6 2013 Jaroslav Škarvada - 3.7.0-0.5.rc0 - Used unversioned doc directory Resolves: rhbz#993794 diff --git a/sources b/sources index 3d49614..2776062 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0b53c4794d24a816c8a12122fe4eaf7e gnuradio-3.7.0rc0.tar.gz +6c5e67da6ed8724dd900d8e343b64be4 gnuradio-3.7.1.tar.gz