another approach, patch bootstrap on the fly

diff --git a/bootstrap.wextoolbox b/bootstrap.wextoolbox
deleted file mode 100755 (executable)
index 630fbad..0000000
--- a/bootstrap.wextoolbox
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# Copyright 2001,2005,2008 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-
-rm -fr config.cache autom4te*.cache
-
-### the original 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/
-aclocal
-
-autoconf
-autoheader
-libtoolize --automake
-automake --add-missing -Wno-portability -Wno-override -Wnone
-#automake --add-missing -Wno-portability
-
-# Run bootstrap in any subprojects
-(cd usrp2/firmware ; ./bootstrap)

diff --git a/gnuradio.spec b/gnuradio.spec
index c68fc0c..f8cfc51 100644 (file)
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -20,7 +20,6 @@ License: GPLv3
 URL: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.2.2.tar.gz
 Group: Productivity/Hamradio/Other
 Source: %{actual_name}.tar.gz
-Source1: bootstrap.wextoolbox
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -39,7 +38,6 @@ Requires: boost >= 1.35
 gnuradio is a free software radio toolkit
 
 %prep
-
 %setup -q -n %{actual_name}
 
 
@@ -47,12 +45,18 @@ gnuradio is a free software radio toolkit
 export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
 # dirty hack to let gnuradio configure find sdcc
 export PATH=$PATH:/usr/libexec/sdcc
-# basically reruns autoconf and automake
+
+########## the bootstrap script basically reruns autoconf and automake
 %if "%{distro}" == "Fedora" && %{distrorelease} >= 12
-bash -x ./bootstrap.wextoolbox
-%else
-bash -x ./bootstrap
+### 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
+
+bash -x ./bootstrap
+
 %configure --disable-doxygen
 make