rpms/gnuradio/F-10 gnuradio-3.1.3-comedilib0.8.patch, NONE, 1.1 gnuradio-3.1.3-werror.patch, NONE, 1.1 gnuradio.spec, 1.6, 1.7 sources, 1.3, 1.4

[Marek Mahut]

Author: mmahut

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

Modified Files:
	gnuradio.spec sources 
Added Files:
	gnuradio-3.1.3-comedilib0.8.patch gnuradio-3.1.3-werror.patch 
Log Message:
* Fri Dec 19 2008 Marek Mahut <mmahut at fedoraproject.org> - 3.1.3-1
> - Upstream release 3.1.3
> - Comedi support
> - RHBZ#473928 Unowned directories  


gnuradio-3.1.3-comedilib0.8.patch:

--- NEW FILE gnuradio-3.1.3-comedilib0.8.patch ---
Marek Mahut <mmahut at fedoraproject.org>: Comedilib 0.8 API change


diff -Naur gnuradio-3.1.3/gr-comedi/src/comedi_sink_s.cc gnuradio-3.1.3-upstream/gr-comedi/src/comedi_sink_s.cc
--- gnuradio-3.1.3/gr-comedi/src/comedi_sink_s.cc	2008-12-19 21:51:25.000000000 +0100
+++ gnuradio-3.1.3-upstream/gr-comedi/src/comedi_sink_s.cc	2008-12-19 23:08:59.000000000 +0100
@@ -88,7 +88,7 @@
   comedi_cmd cmd;
   int ret;
 
-  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq));
+  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,cmd.chanlist_len,(unsigned int)(1e9/sampling_freq));
   if(ret<0)
     bail ("comedi_get_cmd_generic_timed", comedi_errno());
 
diff -Naur gnuradio-3.1.3/gr-comedi/src/comedi_source_s.cc gnuradio-3.1.3-upstream/gr-comedi/src/comedi_source_s.cc
--- gnuradio-3.1.3/gr-comedi/src/comedi_source_s.cc	2008-12-19 21:51:25.000000000 +0100
+++ gnuradio-3.1.3-upstream/gr-comedi/src/comedi_source_s.cc	2008-12-19 23:08:31.000000000 +0100
@@ -85,7 +85,7 @@
   comedi_cmd cmd;
   int ret;
 
-  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq));
+  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,cmd.chanlist_len,(unsigned int)(1e9/sampling_freq));
   if(ret<0)
     bail ("comedi_get_cmd_generic_timed", comedi_errno());
 

gnuradio-3.1.3-werror.patch:

--- NEW FILE gnuradio-3.1.3-werror.patch ---
Marek Mahut <mmahut at fedoraproject.org>: -Werror really sucks

diff -Naur gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.am gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.am
--- gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.am	2008-06-25 20:57:45.000000000 +0200
+++ gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.am	2008-12-19 22:24:40.000000000 +0100
@@ -17,7 +17,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-INCLUDES = -Wall -Werror
+INCLUDES = -Wall 
 LIBS = -lm
 
 noinst_LTLIBRARIES = libviterbi.la
diff -Naur gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.in gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.in
--- gnuradio-3.1.3/gnuradio-core/src/lib/viterbi/Makefile.in	2008-08-24 02:37:34.000000000 +0200
+++ gnuradio-3.1.3-upstream/gnuradio-core/src/lib/viterbi/Makefile.in	2008-12-19 22:24:54.000000000 +0100
@@ -484,7 +484,7 @@
 with_SWIGDIRPATH = @with_SWIGDIRPATH@
 with_SWIG_INCLUDES = @with_SWIG_INCLUDES@
 with_dirs = @with_dirs@
-INCLUDES = -Wall -Werror
+INCLUDES = -Wall
 noinst_LTLIBRARIES = libviterbi.la
 libviterbi_la_SOURCES = \
     metrics.c		\


Index: gnuradio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnuradio/F-10/gnuradio.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnuradio.spec	10 Jun 2008 15:31:42 -0000	1.6
+++ gnuradio.spec	20 Dec 2008 00:08:14 -0000	1.7
@@ -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.2
-Release:	2%{?dist}
+Version:	3.1.3
+Release:	1%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -10,8 +10,9 @@
 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)
-Patch0:		gnuradio-3.1.2-gcc34.patch
-Patch1:		gnuradio-3.1.2-libtool.bug.patch
+Patch0:		gnuradio-3.1.3-libtool.bug.patch
+Patch1:		gnuradio-3.1.3-werror.patch
+Patch2:		gnuradio-3.1.3-comedilib0.8.patch
 
 BuildRequires:	sdcc
 BuildRequires:	fftw-devel
@@ -29,6 +30,7 @@
 BuildRequires:	guile-devel
 BuildRequires:	portaudio-devel
 BuildRequires:	libtool
+BuildRequires:	comedilib-devel
 Requires:	numpy
 Requires:	wxPython
 Requires:	scipy
@@ -84,8 +86,9 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
-%patch1 -p1 -b .libtool
+%patch0 -p1 -b .libtool
+%patch1 -p1 -b .werror
+%patch2 -p1 -b .comedilib
 
 %build
 export PATH=%{_libexecdir}/sdcc:$PATH
@@ -147,7 +150,7 @@
 
 %files examples
 %defattr(-,root,root,-)
-%{_datadir}/%{name}/examples
+%{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/examples/atsc/*.pyc
 %exclude %{_datadir}/%{name}/examples/atsc/*.pyo
 %exclude %{_datadir}/%{name}/examples/audio/*.pyc
@@ -189,6 +192,14 @@
 %{_includedir}/usrp_*
 
 %changelog
+* Fri Dec 19 2008 Marek Mahut <mmahut at fedoraproject.org> - 3.1.3-1
+- Upstream release 3.1.3
+- Comedi support
+- RHBZ#473928 Unowned directories  
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.1.2-3
+- Rebuild for Python 2.6
+
 * Tue Jun 10 2008 Marek Mahut <mmahut at fedoraproject.org> - 3.1.2-2
 - Moving usrp header files to usrp-devel (reported by Philip Balister)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnuradio/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Apr 2008 19:36:32 -0000	1.3
+++ sources	20 Dec 2008 00:08:14 -0000	1.4
@@ -1 +1 @@
-0208be69c598b37c8a0c4f59437e55d9  gnuradio-3.1.2.tar.gz
+c1eb3de26b67ddc08a61a7c2fc636203  gnuradio-3.1.3.tar.gz