rpms/maxima/FC-3 maxima.spec,1.12,1.13 xmaxima.desktop,1.3,1.4

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21648

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
sync w/devel branch



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/maxima.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maxima.spec	28 Oct 2005 19:10:40 -0000	1.12
+++ maxima.spec	5 Jan 2006 15:49:49 -0000	1.13
@@ -3,14 +3,16 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 6%{?dist} 
+Release: 9%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc (and maybe ppc64)  when lisps build again on ppc 
+# add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
+#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
+#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp
@@ -19,8 +21,8 @@
 %define _enable_clisp --enable-clisp 
 # cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796
 #define _enable_cmucl --enable-cmucl 
-# gcl not built for fc5/development (yet)
-%if "%{?fedora}" < "5"
+%if "%{?fedora}" != "5"
+# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %endif
 %define _enable_sbcl --enable-sbcl 
@@ -101,8 +103,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-# To appease those who are paranoid about rpm queries at build time
-#define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
+#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -140,9 +141,8 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.6
-## To appease those who are paranoid about rpm queries at build time
-#define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )}
+BuildRequires: sbcl 
+#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -315,7 +315,7 @@
 %{_bindir}/xmaxima
 %{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
 
 %if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp
@@ -351,6 +351,15 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
+- OK, loosen Req's again (buildsystem can't handle it)
+
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
+- tighten Req: on clisp/sbcl runtimes
+
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
+- rebuild for/with new clisp,sbcl
+
 * Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-6
 - --enable-sbcl
 - avoid rpmquery's at build-time


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/xmaxima.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmaxima.desktop	26 Nov 2005 19:38:09 -0000	1.3
+++ xmaxima.desktop	5 Jan 2006 15:49:49 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=Symbolic Computation Program
 Exec=xmaxima
 Icon=maxima
-MimeType=
+#MimeType=
 Type=Application
 Categories=Application;Science;Education;Math;
 Encoding=UTF-8