rpms/sbcl/devel sbcl.spec,1.18,1.19

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	sbcl.spec 
Log Message:
cleanup sbcl_arch handling, with x86_64 exception



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sbcl.spec	27 Sep 2005 19:09:05 -0000	1.18
+++ sbcl.spec	27 Sep 2005 19:12:21 -0000	1.19
@@ -19,6 +19,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: %{ix86} x86_64 ppc
 
+%define sbcl_arch %{_target_cpu}
+
 %if "%{?sbcl_bootstrap}" == "%{nil}"
 # local Bootstrap binaries
 #Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-linux-binary.tar.bz2
@@ -28,6 +30,7 @@
 %endif
 #Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
+%define sbcl_arch x86-64
 %define sbcl_bootstrap sbcl
 #define sbcl_bootstrap_src -a 20 
 %endif
@@ -113,9 +116,7 @@
 %define my_setarch ./my_setarch
 %endif
 
-%ifarch ppc
-export SBCL_ARCH=%{_target_cpu}
-%endif
+%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
 %{?setarch} %{?my_setarch} ./make.sh %{?bootstrap}
 
 # docs