rpms/sbcl/devel sbcl.spec,1.2,1.3

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3136

Modified Files:
	sbcl.spec 
Log Message:
rename bootstrap -> sbcl_bootstrap



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sbcl.spec	12 Sep 2005 17:54:36 -0000	1.2
+++ sbcl.spec	12 Sep 2005 18:11:40 -0000	1.3
@@ -3,9 +3,9 @@
 ## Default to using a local bootstrap, 
 ## define one of the following to override 
 ## (non sbcl bootstraps untested)
-#define bootstrap sbcl
-#define bootstrap cmucl
-#define bootstrap clisp
+#define sbcl_bootstrap sbcl
+#define sbcl_bootstrap cmucl
+#define sbcl_bootstrap clisp
 
 %if "%{?fedora}" >= "3"
 BuildRequires:setarch
@@ -21,7 +21,7 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -32,20 +32,20 @@
 
 Source1: sbcl.sh
 
-%if "%{?bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
 Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
-%define bootstrap_src -a 10 
+%define sbcl_bootstrap_src -a 10 
 %endif
 Source11: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-x86-64-linux-binary.tar.bz2
 %ifarch %{x86_64}
-%define bootstrap_src -a 11 
+%define sbcl_bootstrap_src -a 11 
 %endif
 # Latest powerpc-linux bootstrap (untested)
 Source12: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
-%define bootstrap_src -a 12
+%define sbcl_bootstrap_src -a 12
 %endif
 %endif
 
@@ -54,7 +54,7 @@
 Patch2: sbcl-0.9.4-ADDR_NO_RANDOMIZE.patch
 Patch3: sbcl-0.9.4-optflags.patch
 
-%{?bootstrap:BuildRequires: %{?bootstrap}}
+%{?sbcl_bootstrap:BuildRequires: %{?sbcl_bootstrap}}
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -69,7 +69,7 @@
 
 
 %prep
-%setup %{?bootstrap_src} 
+%setup %{?sbcl_bootstrap_src} 
 
 #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
@@ -88,7 +88,7 @@
 %endif
 #endif
 
-%if "%{?bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap}" == "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
 chmod +x install.sh
@@ -104,7 +104,7 @@
 %build
 export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 
-%if "%{?bootstrap}" == "%{nil}"
+%if "%{?sbcl_bootstrap}" == "%{nil}"
 export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
 export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
 %endif
@@ -181,7 +181,7 @@
 
 
 %changelog
-* Mon Sep 12 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-5
+* Mon Sep 12 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-6
 - diagnose bootstrap snafu on buildsystem 
 
 * Tue Aug 30 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-4