[gnuradio] New version Dropped retval patch

[Jaroslav Škarvada]

commit bd438c36b4fa7ceaab1820166d33b11acf629004
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Sat Oct 29 00:17:50 2011 +0200

    New version
    Dropped retval patch

 .gitignore                                         |    2 +-
 gnuradio-3.4.0-retval.patch                        |   11 ----------
 ...3.4.0-sdcc3.patch => gnuradio-3.4.2-sdcc3.patch |   12 ----------
 gnuradio.spec                                      |   22 +++++++++++--------
 sources                                            |    2 +-
 5 files changed, 15 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 874b5a9..5ecd989 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-gnuradio-3.2.2.tar.gz
+gnuradio-3.4.2.tar.gz
diff --git a/gnuradio-3.4.0-sdcc3.patch b/gnuradio-3.4.2-sdcc3.patch
similarity index 76%
rename from gnuradio-3.4.0-sdcc3.patch
rename to gnuradio-3.4.2-sdcc3.patch
index 7401f8c..9b5b08c 100644
--- a/gnuradio-3.4.0-sdcc3.patch
+++ b/gnuradio-3.4.2-sdcc3.patch
@@ -1,15 +1,3 @@
-diff -up gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4.orig gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4
---- gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4.orig	2011-06-12 05:54:36.000000000 +0200
-+++ gnuradio-3.4.0/gr-howto-write-a-block/config/usrp_sdcc.m4	2011-06-27 16:17:42.001053649 +0200
-@@ -21,7 +21,7 @@ AC_DEFUN([USRP_SDCC],
- [
- 	sdccok=yes
- 	AC_CHECK_PROG(XCC, sdcc, sdcc -mmcs51 --no-xinit-opt,no)
--	AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no)
-+	AC_CHECK_PROG(XAS, sdas8051, sdas8051 -plosgff,no)
- 
- 	if test "$XCC" = "no" -o "$XAS" = "no" ; then
- 		AC_MSG_RESULT([USRP requires sdcc. sdcc not found. See http://sdcc.sf.net])
 diff -up gnuradio-3.4.0/config/usrp_sdcc.m4.orig gnuradio-3.4.0/config/usrp_sdcc.m4
 --- gnuradio-3.4.0/config/usrp_sdcc.m4.orig	2011-06-12 05:54:36.000000000 +0200
 +++ gnuradio-3.4.0/config/usrp_sdcc.m4	2011-06-27 16:17:42.001053649 +0200
diff --git a/gnuradio.spec b/gnuradio.spec
index 9b396d3..9496143 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -1,31 +1,32 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %{?_smp_mflags: %global my_smp_mflags %(echo "%{_smp_mflags}" | sed 's/-j[0-9]\\+/-j1/g')}
 
-# 3.4.0 version is not yet on ftp, pull from git
-%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
+# For versions not yet on ftp, pull from git
+#%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
+
+# For versions published as attachment (strange)
+%global attachment_id 279
 
 Name:		gnuradio
-Version:	3.4.0
-Release:	5%{?dist}
+Version:	3.4.2
+Release:	1%{?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
 # git clone git://gnuradio.org/gnuradio
 # cd gnuradio
 # git archive --format=tar --prefix=%{name}-%{version}/ %{git_commit} | \
 # gzip > ../%{name}-%{version}.tar.gz
-Source0:	gnuradio-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source1:	10-usrp.rules
 # fixed compilation with sdcc3
-Patch4:		gnuradio-3.4.0-sdcc3.patch
+Patch4:		gnuradio-3.4.2-sdcc3.patch
 # fixed detection of libusb
 Patch5:		gnuradio-3.4.0-libusb-detect-fix.patch
-# add missing return value in generated code
-Patch6:		gnuradio-3.4.0-retval.patch
 
 Requires(pre):	shadow-utils
 BuildRequires:	sdcc
@@ -105,7 +106,6 @@ GNU Radio examples
 %setup -q
 %patch4 -p1 -b .sdcc3
 %patch5 -p1 -b .libusb-detect-fix
-%patch6 -p1 -b .retval
 
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
@@ -175,6 +175,10 @@ getent group usrp >/dev/null || groupadd -r usrp
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Thu Oct 27 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.4.2-1
+- New version
+- Dropped retval patch
+
 * Fri Oct 21 2011 Dan Horák <dan[at]danny.cz> - 3.4.0-5
 - add missing return value in generated code
 - add BR: orc-devel - needed for secondary arches in volk
diff --git a/sources b/sources
index 8d1cf5e..c297f54 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d48283504e0e5abd1c2e6848bc885506  gnuradio-3.4.0.tar.gz
+bb4eafa483375e3422802bc070c20827  gnuradio-3.4.2.tar.gz