rpms/maxima/EL-4 maxima.spec, 1.25, 1.26 maxima-5.9.4-gcl_setarch.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/maxima/EL-4
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7699

Modified Files:
	maxima.spec 
Removed Files:
	maxima-5.9.4-gcl_setarch.patch 
Log Message:
sync w/EL-5 branch



Index: maxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maxima/EL-4/maxima.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- maxima.spec	23 Dec 2009 01:22:43 -0000	1.25
+++ maxima.spec	10 May 2010 20:53:09 -0000	1.26
@@ -3,19 +3,14 @@ Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.20.1
 
-Release: 1%{?dist} 
+Release: 4%{?dist}
 License: GPLv2
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://downloads.sourceforge.net/sourceforge/maxima/maxima-%{version}%{?beta}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?fedora} > 8
-# reinclude ppc when fixed: http://bugzilla.redhat.com/448734
-ExclusiveArch: %{ix86} x86_64 sparcv9
-%else
 ExclusiveArch: %{ix86} x86_64 ppc sparcv9
-%endif
 
 %define maxima_ver %{version}%{?beta}
 %define emacs_sitelisp  %{_datadir}/emacs/site-lisp/
@@ -49,10 +44,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
 #define _enable_clisp --enable-clisp 
 # temporarily disable -gcl (#496124)
 #define _enable_gcl --enable-gcl
-# sbcl:  http://bugzilla.redhat.com/220053 (resolved)
-# sbcl: ppc/ld joy, "final link failed: Nonrepresentable section on output" http://bugzilla.redhat.com/448734
 %define _enable_sbcl --enable-sbcl 
-%define check_nonfatal ||:
 %endif
 
 %ifarch sparcv9
@@ -110,6 +102,7 @@ Requires: %{name}-runtime = %{version}
 #Requires(hint): %{name}-runtime-%{default_lisp} = %{version}
 #endif
 Requires: gnuplot
+Requires: rlwrap
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
@@ -184,11 +177,12 @@ Maxima compiled with Gnu Common Lisp (gc
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 BuildRequires: sbcl
-# maxima requires the *same* (or very similar) version it was built against
-# this hack should work, even in mock (-: -- Rex
+# requires the same sbcl version it was built against
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2 | cut -d- -f1)
 %if "x%{?sbcl_ver}" != "x%{nil}" 
 Requires: sbcl = %{sbcl_ver}
+%else
+Requires: sbcl
 %endif
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -242,7 +236,7 @@ popd
 
 
 %check 
-make -k check %{?check_nonfatal}
+make -k check
 
 
 %install
@@ -278,8 +272,6 @@ ln -sf  %{_datadir}/maxima/%{maxima_ver}
 
 ## unwanted/unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-# until we get/Require rlwrap from http://utopia.knoware.nl/~hlub/uck/rlwrap/
-rm -f $RPM_BUILD_ROOT%{_bindir}/rmaxima
 # docs
 rm -rf $RPM_BUILD_ROOT%{_datadir}/maxima/%{maxima_ver}/doc/{contributors,implementation,misc,maximabook,EMaximaIntro.ps}
 
@@ -359,6 +351,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/intromax/intromax.pdf
 %doc doc/maximabook/maxima.pdf
 %{_bindir}/maxima
+%{_bindir}/rmaxima
 %dir %{_datadir}/maxima
 %dir %{_datadir}/maxima/%{maxima_ver}
 %{_datadir}/maxima/%{maxima_ver}/[a-c,f-r,t-w,y-z,A-Z]*
@@ -432,6 +425,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 10 2010 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-4
+- rebuild (sbcl)
+- re-enable ppc
+
+* Tue Feb 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-3
+- rebuild (sbcl)
+
+* Wed Dec 16 2009 Stephen Beahm <stephenbeahm at comcast.net> - 5.20.1-2
+- enable rmaxima (#551910)
+
 * Tue Dec 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 5.20.1-1
 - maxima-5.20.1 (#547012)
 


--- maxima-5.9.4-gcl_setarch.patch DELETED ---