rpms/sbcl/devel sbcl.sh,1.3,1.4 sbcl.spec,1.10,1.11

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	sbcl.sh sbcl.spec 
Log Message:
* Fri Sep 16 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-14
- re-enable ppc
- drop Req: setarch
- drop extraneous app-wrapper bits



Index: sbcl.sh
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sbcl.sh	13 Sep 2005 16:50:44 -0000	1.3
+++ sbcl.sh	16 Sep 2005 19:15:45 -0000	1.4
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # Source global config, if it exists
-if [ -f /etc/sysconfig/sbcl ]; then
-  source /etc/sysconfig/sbcl
+if [  -f /etc/sbcl.conf ]; then
+  source /etc/sbcl.conf
 fi
 
 exec ${SBCL_HOME}/sbcl ${1+"$@"}


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sbcl.spec	13 Sep 2005 19:03:04 -0000	1.10
+++ sbcl.spec	16 Sep 2005 19:15:45 -0000	1.11
@@ -9,7 +9,6 @@
 
 %if "%{?fedora}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
@@ -17,28 +16,22 @@
 %define setarch setarch %{_target_cpu} -R
 %endif
 
-%if "%{?rhel}" >= "4"
+%if "%{?rhel}" >= "3"
 BuildRequires:setarch
-Requires:setarch
 %define setarch setarch %{_target_cpu}
 %endif
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.4
-Release: 13%{?dist}
+Release: 14%{?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
-
-# App-wrapper
-Source1: sbcl.sh
-# /etc/sysconfig/sbcl
-Source2: sbcl.sysconfig
+ExclusiveArch: %{ix86} x86_64 ppc 
 
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
@@ -148,14 +141,6 @@
 # (may) still need setarch if using ADDR_NO_RANDOMIZE-proc patch
 sh ./install.sh
 
-# app-wrapper 
-%if 0
-mv $RPM_BUILD_ROOT%{_bindir}/sbcl $RPM_BUILD_ROOT%{_libdir}/sbcl/sbcl
-install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/sbcl
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl
-#{?setarch:echo "SBCL_SETARCH=\"%{setarch}\"|" >> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/sbcl 
-%endif
-
 ## Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
@@ -192,6 +177,11 @@
 
 
 %changelog
+* Fri Sep 16 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-14
+- re-enable ppc
+- drop Req: setarch
+- drop extraneous app-wrapper bits
+
 * Tue Sep 13 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.4-13
 - don't enable sb-thread