rpms/maxima/devel maxima-5.9.4-gcl_setarch.patch, NONE, 1.1 maxima.spec, 1.30, 1.31 maxima-5.9.3-gcl-setarch.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.9.4-gcl_setarch.patch 
Removed Files:
	maxima-5.9.3-gcl-setarch.patch 
Log Message:
* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.4.rc2
- update gcl_setarch patch


maxima-5.9.4-gcl_setarch.patch:

--- NEW FILE maxima-5.9.4-gcl_setarch.patch ---
--- maxima-5.9.3.99rc2/src/maxima.in.gcl-setarch	2006-07-30 21:25:52.000000000 -0500
+++ maxima-5.9.3.99rc2/src/maxima.in	2006-08-09 10:05:21.000000000 -0500
@@ -128,7 +128,7 @@
 	exec "@SCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
     fi
 elif [ "$MAXIMA_LISP" = "gcl" ]; then
-    exec "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    exec "setarch" "@ARCH@" "-X" "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 elif [ "$MAXIMA_LISP" = "acl" ]; then
 # FIXME: arguments need in a manner consistent with the way they are extracted
 #        in the function get-application-args in command-line.lisp


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- maxima.spec	9 Aug 2006 14:50:28 -0000	1.30
+++ maxima.spec	9 Aug 2006 15:07:26 -0000	1.31
@@ -8,7 +8,7 @@
 Name: 	 maxima
 Version: 5.9.3.99
 
-Release: 0.3.%{beta}%{?dist}
+Release: 0.4.%{beta}%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -56,7 +56,7 @@
 # emaxima fix from Camm Maguire
 Patch5: maxima-5.9.2-emaxima.patch
 # maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647)
-Patch6: maxima-5.9.3-gcl-setarch.patch
+Patch6: maxima-5.9.4-gcl_setarch.patch
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -143,12 +143,12 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if "%{?fedora}" > "4"
+#if "%{?fedora}" > "4"
 # See http://bugzilla.redhat.com/bugzilla/187647
 %define setarch_hack 1
 BuildRequires: setarch
 Requires:  setarch
-%endif
+#endif
 Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
 Provides:  %{name}-runtime-gcl = %{version}-%{release}
@@ -387,6 +387,9 @@
 
 
 %changelog
+* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.4.rc2
+- update gcl_setarch patch
+
 * Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3.99-0.3.rc2
 - 5.9.3.99rc2
 


--- maxima-5.9.3-gcl-setarch.patch DELETED ---