X-Git-Url: http://git.onelab.eu/?p=gnuradio.git;a=blobdiff_plain;f=gnuradio.spec;h=bedafbf47d9b4faf74cd31f4a02cbcc962723847;hp=f8cfc51ad1fb62eafd793ece4117647649f1b93f;hb=HEAD;hpb=6963eef91c35d2f25e524f248a58865dfacb97c0

diff --git a/gnuradio.spec b/gnuradio.spec
index f8cfc51..bedafbf 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -1,13 +1,9 @@
-# SPEC file for gnuradio
-#
-#
-# Source: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.2.tar.gz
-#
-# Signature: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.2.tar.gz.sig
+# $Id$
+# $URL$
 #
 %define name gnuradio
 %define version 3.2.2
-%define release 21
+%define release 22
 %define actual_name %{name}-%{version}
 
 %define module_taglevel_varname release
@@ -19,7 +15,9 @@ Release: %{release}
 License: GPLv3
 URL: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.2.tar.gz
 Group: Productivity/Hamradio/Other
-Source: %{actual_name}.tar.gz
+Source0: %{actual_name}.tar.gz
+Source1:	10-usrp.rules
+Patch0:		gnuradio-3.2-libtool.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,30 +37,32 @@ gnuradio is a free software radio toolkit
 
 %prep
 %setup -q -n %{actual_name}
+%patch0 -p1 -b .libtool
 
 
 %build
 export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
 # dirty hack to let gnuradio configure find sdcc
-export PATH=$PATH:/usr/libexec/sdcc
+export PATH=%{_libexecdir}/sdcc:$PATH
 
 ########## the bootstrap script basically reruns autoconf and automake
 %if "%{distro}" == "Fedora" && %{distrorelease} >= 12
-### the code in bootstrapfs reads
-### aclocal -I config
-# we suppress the -I config so that e.g. the libtool macros used are the ones from the system, 
-# not the one that ships in config/
-sed -i -e "s,aclocal -I config,aclocal," ./bootstrap
-%endif
-
+autoreconf -i
+%configure --disable-doxygen
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+#make %{?_smp_mflags}
+make
+%else
 bash -x ./bootstrap
-
 %configure --disable-doxygen
 make
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+install -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/10-usrp.rules
 
 #make DESTDIR=$RPM_BUILD_ROOT install
 %makeinstall
@@ -115,17 +115,19 @@ Devel package of gnuradio
 %dir %{_datadir}/usrp
 %{_datadir}/usrp/*
 # TO FIX: if the 2 following commands are removed, the rpmbuild fails!
-# It's w+eird because rev2 and rev3 directories are indeed created at the 
+# It's weird because rev2 and rev3 directories are indeed created at the 
 # right place (/usr/share/rev*) when the rpm is installed...
 %{_datadir}/rev2/*
 %{_datadir}/rev4/*
+%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp.rules
 %doc AUTHORS README README.hacking ChangeLog NEWS INSTALL COPYING
 
 
 
-
-
 %changelog -n gnuradio
+* Wed Jan 20 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - gnuradio-3.2.2-22
+- reworked for f12
+
 * Wed Oct 8 2009 Thierry Turletti <turletti@sophia.inria.fr> 3.2.2-2.1
 - fixed lots of missing parameters...
 
@@ -134,6 +136,3 @@ Devel package of gnuradio
 
 * Wed Apr 1 2009  Ben Yahmed Maher <ben.yahmed.maher@gmail.com> 3.2.2-1.2
 - change to svn 10720 with fedora 10
-
-
-