[gnuradio: 1/2] New pre-release version Followed upstream and dropped support for usrp, use uhd instead Dropped sdcc

[Jaroslav Škarvada]

commit e510c1b49c0a9ebe88d08ec8064ab6e150d7fdb6
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Dec 2 00:47:28 2011 +0100

    New pre-release version
    Followed upstream and dropped support for usrp, use uhd instead
    Dropped sdcc3 and libusb-detect-fix patches
    Dropped 10-usrp.rules and usrp group creation, now handled by uhd

 10-usrp.rules                          |    3 --
 gnuradio-3.4.0-libusb-detect-fix.patch |   40 ----------------------
 gnuradio-3.4.2-sdcc3.patch             |   57 --------------------------------
 gnuradio.spec                          |   41 ++++++++++-------------
 4 files changed, 18 insertions(+), 123 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index 9496143..a40dd11 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -5,28 +5,27 @@
 #%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
 
 # For versions published as attachment (strange)
-%global attachment_id 279
+%global attachment_id 281
+
+# For pre-release versions
+%global prerelease rc0
 
 Name:		gnuradio
-Version:	3.4.2
-Release:	1%{?dist}
+Version:	3.5.0
+Release:	0.1.%{prerelease}%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
 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/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}.tar.gz
+Source0:	http://gnuradio.org/redmine/attachments/download/%{attachment_id}/gnuradio-%{version}%{prerelease}.tar.gz
 # git clone git://gnuradio.org/gnuradio
 # cd gnuradio
 # git archive --format=tar --prefix=%{name}-%{version}/ %{git_commit} | \
 # gzip > ../%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source1:	10-usrp.rules
-# fixed compilation with sdcc3
-Patch4:		gnuradio-3.4.2-sdcc3.patch
-# fixed detection of libusb
-Patch5:		gnuradio-3.4.0-libusb-detect-fix.patch
 
 Requires(pre):	shadow-utils
 BuildRequires:	sdcc
@@ -59,13 +58,13 @@ BuildRequires:	xdg-utils
 BuildRequires:	python-lxml
 BuildRequires:	pygtk2-devel
 BuildRequires:	orc-devel
+BuildRequires:	uhd-devel
 Requires:	numpy
 Requires:	wxPython
 Requires:	scipy
 Requires:	portaudio
 Requires:	python-lxml
 Requires:	pygtk2
-Provides:	usrp = %{version}-%{release}
 Obsoletes:	usrp <  3.3.0-1
 Obsoletes:	grc < 0.80-1
 
@@ -80,7 +79,6 @@ performance wireless devices into software problems.
 Summary:	GNU Radio
 Group:		Applications/Engineering
 Requires:	%{name} = %{version}-%{release}
-Provides:	usrp-devel = %{version}-%{release}
 Obsoletes:	usrp-devel <  3.3.0-1
 
 %description devel
@@ -103,22 +101,18 @@ Requires:	%{name} = %{version}-%{release}
 GNU Radio examples
 
 %prep
-%setup -q
-%patch4 -p1 -b .sdcc3
-%patch5 -p1 -b .libusb-detect-fix
+%setup -q -n %{name}-%{version}%{prerelease}
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
 
 %build
-export PATH=%{_libexecdir}/sdcc:$PATH
-./bootstrap
+#./bootstrap
 #enabling deps tracking is workaround to build
 %configure --enable-dependency-tracking --enable-python --enable-doxygen \
 --enable-dot --enable-volk --enable-gruel --enable-gnuradio-core \
---enable-usrp --enable-usrp2 --enable-gr-usrp --enable-gr-usrp2 \
 --enable-gr-msdd6000 --enable-gr-audio --enable-gr-atsc \
---enable-gr-cvsd-vocoder --enable-gr-gpio \
+--enable-gr-cvsd-vocoder --enable-gr-gpio --enable-gr-uhd \
 --enable-gr-gsm-fr-vocoder --enable-gr-noaa --enable-gr-pager \
 --enable-gr-radar-pager --enable-gr-radar-mono --enable-gr-radio-astronomy \
 --enable-gr-trellis --enable-gr-video-sdl --enable-gr-wxgui \
@@ -135,15 +129,12 @@ make %{?my_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$R
 rm -rf $RPM_BUILD_ROOT
 export PATH=%{_libexecdir}/sdcc:$PATH
 make install DESTDIR=$RPM_BUILD_ROOT
-install -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-usrp.rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post -n gnuradio -p /sbin/ldconfig
 %postun -n gnuradio -p /sbin/ldconfig
-%pre -n gnuradio
-getent group usrp >/dev/null || groupadd -r usrp
 
 %files
 %defattr(-,root,root,-)
@@ -152,8 +143,6 @@ getent group usrp >/dev/null || groupadd -r usrp
 %{_libdir}/lib*.so.*
 %{_libexecdir}/*
 %{_datadir}/gnuradio
-%{_datadir}/usrp
-%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp.rules
 %config(noreplace) %{_sysconfdir}/gnuradio/conf.d/*.conf
 %exclude %{_datadir}/gnuradio/examples
 %exclude %{python_sitearch}/gnuradio/*.la
@@ -175,6 +164,12 @@ getent group usrp >/dev/null || groupadd -r usrp
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Tue Nov 01 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.5.0-0.1.rc0
+- New pre-release version
+- Followed upstream and dropped support for usrp, use uhd instead
+- Dropped sdcc3 and libusb-detect-fix patches
+- Dropped 10-usrp.rules and usrp group creation, now handled by uhd
+
 * Thu Oct 27 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.4.2-1
 - New version
 - Dropped retval patch