rpms/sbcl/FC-4 sbcl.spec,1.22,1.23

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16599

Modified Files:
	sbcl.spec 
Log Message:
* Thu Sep 29 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-15
- enable sb-thread
- set EXTRA_CFLAGS to so optflags are used for building contrib/ too
- hope that a rebuild will include missing sb-posix (bz #169506)



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sbcl.spec	28 Sep 2005 16:43:29 -0000	1.22
+++ sbcl.spec	29 Sep 2005 17:10:35 -0000	1.23
@@ -3,20 +3,21 @@
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.5
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#ExclusiveArch: %{ix86} x86_64
-ExclusiveArch: ppc
+ExclusiveArch: %{ix86} x86_64
 
-Source1: customize-target-features.lisp 
+# Pre-generated html docs (not used)
+#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
+Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -70,6 +71,11 @@
 %prep
 %setup -q %{?sbcl_bootstrap_src} 
 
+# Handle pre-generated docs
+if [ -d %{name}-%{version}/doc/manual ]; then
+  mv %{name}-%{version}/doc/manual/* doc/manual/
+fi
+
 #sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
 #or patch to use SBCL_HOME env var
 %patch1 -p0 -b .default-sbcl-home
@@ -80,11 +86,13 @@
 %patch6 -p1 -b .verbose-build
 %patch7 -p1 -b .stdlib_h
 
+# Enable sb-thread
 %ifarch %{ix86} x86_64
 #sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
-#cp %{SOURCE1} ./customize-target-features.lisp
+cp %{SOURCE2} ./customize-target-features.lisp
 %endif
 
+# "install" local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
 pushd sbcl-*-linux
@@ -93,24 +101,26 @@
 popd
 %endif
 
-# CVS crud 
-find . -name CVS -type d | xargs rm -rf
-find . -name '.cvsignore' | xargs rm -f
 # fix permissions (some have eXecute bit set)
 find . -name '*.c' | xargs chmod 644
 
 
 %build
-export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 
+# setup local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
 export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
+%endif
 
+# my_setarch, to set personality, (about) the same as setarch -R, 
+# but usable on fc3 too
 %{__cc} -o my_setarch %{optflags} %{SOURCE100} 
 %define my_setarch ./my_setarch
-%endif
 
+# trick contrib/ modules to use optflags too 
+export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
 %{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
 %{?setarch} %{?my_setarch} ./make.sh %{?bootstrap}
 
@@ -133,16 +143,20 @@
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}}
-unset SBCL_HOME ||:
-export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
-export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
-sh ./install.sh
+
+unset SBCL_HOME 
+export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} 
+export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} 
+sh ./install.sh 
 
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
-# from make check
-find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
+# CVS crud 
+find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
+find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f
+# 'test-passed' files from make check (leave these in, for now -- Rex)
+# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
 
 
 %post
@@ -174,6 +188,11 @@
 
 
 %changelog
+* Thu Sep 29 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-15
+- enable sb-thread
+- set EXTRA_CFLAGS to so optflags are used for building contrib/ too
+- hope that a rebuild will include missing sb-posix (bz #169506)
+
 * Wed Sep 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-14
 - more ppc work