rpms/maxima/FC-4 maxima.spec,1.16,1.17
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Fri Mar 10 19:36:33 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4212
Modified Files:
maxima.spec
Log Message:
* Thu Mar 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-12
- enable runtime-cmucl (%%ix86 only, atm)
* Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-11
- fc5: enable runtime-gcl
- runtime-sbcl: Requires: sbcl = %%{sbcl_version_used_to_build}
Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- maxima.spec 27 Feb 2006 15:34:04 -0000 1.16
+++ maxima.spec 10 Mar 2006 19:36:33 -0000 1.17
@@ -3,7 +3,7 @@
Name: maxima
Version: 5.9.2
-Release: 10%{?dist}
+Release: 12%{?dist}
License: GPL
Group: Applications/Engineering
URL: http://maxima.sourceforge.net/
@@ -17,14 +17,15 @@
%define _with_default_lisp --with-default-lisp=clisp
+%ifarch %{ix86}
+# cmucl review (done): http://bugzilla.redhat.com/bugzilla/166796
+%define _enable_cmucl --enable-cmucl
+%endif
+
%ifarch %{ix86} x86_64
%define _enable_clisp --enable-clisp
-# cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796
-#define _enable_cmucl --enable-cmucl
-%if "%{?fedora}" != "5"
-# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
+# gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
%define _enable_gcl --enable-gcl
-%endif
%define _enable_sbcl --enable-sbcl
%endif
@@ -142,8 +143,13 @@
Summary: Maxima compiled with SBCL
Group: Applications/Engineering
BuildRequires: sbcl
-#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
-Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}}
+# maxima requires the *same* version it was built against
+# this hack should work, even in mock (-: -- Rex
+%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
+%if "%{?sbcl_ver}" >= "0.9"
+%define sbcl_ver2 = %{sbcl_ver}
+%endif
+Requires: sbcl %{?sbcl_ver2}
Requires: %{name} = %{version}
Obsoletes: maxima-exec-sbcl < %{version}-%{release}
Provides: %{name}-runtime = %{version}
@@ -351,6 +357,13 @@
%changelog
+* Thu Mar 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-12
+- enable runtime-cmucl (%%ix86 only, atm)
+
+* Wed Mar 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-11
+- fc5: enable runtime-gcl
+- runtime-sbcl: Requires: sbcl = %%{sbcl_version_used_to_build}
+
* Mon Feb 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-10
- respin for sbcl-0.9.10
More information about the fedora-extras-commits
mailing list