[sbcl] - sbcl-1.0.42

[Rex Dieter]

commit 414cd471cf6638949db647a8467ed3a24d94ef69
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 18 12:35:44 2010 -0500

    - sbcl-1.0.42

 .gitignore                          |    2 +-
 sbcl-0.9.17-LIB_DIR.patch           |   36 --------------------------
 sbcl-1.0.25-default_sbcl_home.patch |   47 -----------------------------------
 sbcl.spec                           |   19 ++++++-------
 sources                             |    2 +-
 5 files changed, 11 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c20b95c..b47da02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-sbcl-1.0.41-source.tar.bz2
+/sbcl-1.0.42-source.tar.bz2
diff --git a/sbcl.spec b/sbcl.spec
index 6e3b860..766b9ac 100644
--- a/sbcl.spec
+++ b/sbcl.spec
@@ -15,7 +15,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 1.0.41
+Version: 1.0.42
 Release: 1%{?dist}
 
 License: BSD
@@ -80,10 +80,8 @@ Source201: sbcl.rc
 Source202: sbcl-install-clc.lisp
 %endif
 
-Patch1: sbcl-1.0.25-default_sbcl_home.patch
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-1.0.30-optflags.patch
-Patch4: sbcl-0.9.17-LIB_DIR.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-1.0.2-permissive.patch
@@ -111,12 +109,8 @@ if [ -d %{name}-%{version}/doc/manual ]; then
 mv %{name}-%{version}/doc/manual/* doc/manual/
 fi
 
-#sed -i -e "s|/usr/local/lib/sbcl/|%{_prefix}/lib/sbcl/|" src/runtime/runtime.c
-#or patch to use SBCL_HOME env var
-%patch1 -p1 -b .default_sbcl_home
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
-%patch4 -p1 -b .LIB_DIR
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -163,9 +157,12 @@ export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
 # WORKAROUND sb-concurrency test failures in koji/mock
 touch contrib/sb-concurrency/test-passed
 
-export DEFAULT_SBCL_HOME=%{_prefix}/lib/sbcl
+export SBCL_HOME=%{_prefix}/lib/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
-%{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
+%{?setarch} %{?my_setarch} %{?sbcl_shell} \
+./make.sh \
+  --prefix=%{_prefix} \
+  %{?bootstrap}
 
 # docs
 make -C doc/manual html info
@@ -204,7 +201,6 @@ mkdir -p %{buildroot}{%{_bindir},%{_prefix}/lib,%{_mandir}}
 
 unset SBCL_HOME 
 export INSTALL_ROOT=%{buildroot}%{_prefix} 
-export LIB_DIR=%{buildroot}%{_prefix}/lib
 %{?sbcl_shell} ./install.sh 
 
 %if 0%{?common_lisp_controller}
@@ -259,6 +255,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.42-1
+- sbcl-1.0.42
+
 * Mon Aug 16 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.41-1
 - sbcl-1.0.41
 
diff --git a/sources b/sources
index fe168b9..ea62e28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cdf17acb991fbdc9d3c13263f5c2bb04  sbcl-1.0.41-source.tar.bz2
+09cc54b3afc84fe2ce1d5c2af98ea2a2  sbcl-1.0.42-source.tar.bz2