rpms/gnuradio/F-11 gnuradio.spec,1.12,1.13 sources,1.4,1.5

[Marek Mahut]

Author: mmahut

Update of /cvs/pkgs/rpms/gnuradio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24891

Modified Files:
	gnuradio.spec sources 
Log Message:
Upstream release 3.2


Index: gnuradio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuradio/F-11/gnuradio.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gnuradio.spec	5 Mar 2009 06:28:18 -0000	1.12
+++ gnuradio.spec	27 Jul 2009 14:13:24 -0000	1.13
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		gnuradio
-Version:	3.1.3
-Release:	5%{?dist}
+Version:	3.2
+Release:	1%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -11,10 +11,8 @@ URL:		http://www.gnuradio.org
 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.1.3-libtool.bug.patch
-Patch1:		gnuradio-3.1.3-werror.patch
-Patch2:		gnuradio-3.1.3-comedilib0.8.patch
-Patch3:		gnuradio-3.1.3-gcc44.patch
+Patch0:		gnuradio-3.2-libtool.patch
+Patch1:		gnuradio-3.2-gcc44.patch
 
 Requires(pre):	shadow-utils
 BuildRequires:	sdcc
@@ -34,6 +32,12 @@ BuildRequires:	guile-devel
 BuildRequires:	portaudio-devel
 BuildRequires:	libtool
 BuildRequires:	comedilib-devel
+BuildRequires:	gsl-devel
+BuildRequires:	tex(latex)
+BuildRequires:	numpy
+BuildRequires:	PyQt4-devel
+BuildRequires:	PyQwt-devel
+BuildRequires:	qwtplot3d-qt4-devel
 Requires:	numpy
 Requires:	wxPython
 Requires:	scipy
@@ -90,9 +94,7 @@ GNU Radio USRP headers
 %prep
 %setup -q
 %patch0 -p1 -b .libtool
-%patch1 -p1 -b .werror
-%patch2 -p1 -b .comedilib
-%patch3 -p1 -b .gcc44
+%patch1 -p1 -b .gcc44
 
 %build
 export PATH=%{_libexecdir}/sdcc:$PATH
@@ -124,28 +126,20 @@ getent group usrp >/dev/null || groupadd
 %files
 %defattr(-,root,root,-)
 %{python_sitelib}/gnuradio
-%exclude %{python_sitelib}/gnuradio/_usrp1.so
+%exclude %{python_sitelib}/gnuradio/_usrp2.so
 %exclude %{python_sitelib}/gnuradio/usrp*  
 %{_sysconfdir}/gnuradio
 %{_bindir}/gr_*
-%exclude %{_bindir}/gr_plot*.pyc
-%exclude %{_bindir}/gr_plot*.pyo
-%{_libdir}/libgnuradio-core.so.*
-%{_libdir}/libgnuradio-core-qa.so.*
-%{_libdir}/libgr_audio_alsa.so.*
-%{_libdir}/libgromnithread.so.*
-%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gr-audio-alsa.conf
-%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gnuradio-core.conf
-%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/gr-wxgui.conf
+%{_bindir}/find_usrps
+%{_bindir}/lsusrp
+%{_libdir}/lib*.so.*
+%config(noreplace)%{_sysconfdir}/gnuradio/conf.d/*.conf
 %exclude %{python_sitelib}/gnuradio/*.la
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/gnuradio
-%{_libdir}/libgnuradio-core.so
-%{_libdir}/libgnuradio-core-qa.so
-%{_libdir}/libgr_audio_alsa.so
-%{_libdir}/libgromnithread.so
+%{_includedir}/*
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 %exclude %{_libdir}/*.la
 
@@ -158,26 +152,6 @@ getent group usrp >/dev/null || groupadd
 %files examples
 %defattr(-,root,root,-)
 %{_datadir}/%{name}
-%exclude %{_datadir}/%{name}/examples/atsc/*.pyc
-%exclude %{_datadir}/%{name}/examples/atsc/*.pyo
-%exclude %{_datadir}/%{name}/examples/audio/*.pyc
-%exclude %{_datadir}/%{name}/examples/audio/*.pyo
-%exclude %{_datadir}/%{name}/examples/digital/*.pyc
-%exclude %{_datadir}/%{name}/examples/digital/*.pyo
-%exclude %{_datadir}/%{name}/examples/hf_explorer/*.pyc
-%exclude %{_datadir}/%{name}/examples/hf_explorer/*.pyo
-%exclude %{_datadir}/%{name}/examples/hf_radio/*.pyc
-%exclude %{_datadir}/%{name}/examples/hf_radio/*.pyo
-%exclude %{_datadir}/%{name}/examples/multi-antenna/*.pyc
-%exclude %{_datadir}/%{name}/examples/multi-antenna/*.pyo
-%exclude %{_datadir}/%{name}/examples/multi_usrp/*.pyc
-%exclude %{_datadir}/%{name}/examples/multi_usrp/*.pyo
-%exclude %{_datadir}/%{name}/examples/network/*.pyc
-%exclude %{_datadir}/%{name}/examples/network/*.pyo
-%exclude %{_datadir}/%{name}/examples/trellis/*.pyc
-%exclude %{_datadir}/%{name}/examples/trellis/*.pyo
-%exclude %{_datadir}/%{name}/examples/usrp/*.pyc
-%exclude %{_datadir}/%{name}/examples/usrp/*.pyo
 
 %files -n usrp
 %defattr(-,root,root,-)
@@ -186,11 +160,9 @@ getent group usrp >/dev/null || groupadd
 %{_datadir}/usrp
 %{_libdir}/libusrp.so.*
 %{python_sitelib}/usrpm
-%{python_sitelib}/gnuradio/_usrp1.so
+%{python_sitelib}/gnuradio/_usrp2.so
 %{python_sitelib}/gnuradio/usrp*
-%config %{_sysconfdir}/udev/rules.d/10-usrp.rules
-%exclude %{_bindir}/*.pyc
-%exclude %{_bindir}/*.pyo
+%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp.rules
 %exclude %{_libdir}/*.la
 %exclude %{python_sitelib}/usrpm/*.la
 
@@ -200,6 +172,9 @@ getent group usrp >/dev/null || groupadd
 %{_includedir}/usrp_*
 
 %changelog
+* Sat Jul 25 2009 Marek Mahut <mmahut at fedoraproject.org> - 3.2-1
+- Upstream release 3.2
+
 * Thu Mar  4 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.1.3-5
 - Fix build with GCC 4.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnuradio/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	19 Dec 2008 23:15:36 -0000	1.4
+++ sources	27 Jul 2009 14:13:24 -0000	1.5
@@ -1 +1 @@
-c1eb3de26b67ddc08a61a7c2fc636203  gnuradio-3.1.3.tar.gz
+9d91d0f8f2cb35bc86435784fa8e72d8  gnuradio-3.2.tar.gz