rpms/maxima/FC-3 maxima-5.9.2-emaxima.patch, NONE, 1.1 maxima-5.9.2-evince.patch, NONE, 1.1 maxima.spec, 1.11, 1.12 xmaxima.desktop, 1.1, 1.2

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	maxima.spec xmaxima.desktop 
Added Files:
	maxima-5.9.2-emaxima.patch maxima-5.9.2-evince.patch 
Log Message:
* Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-6
- --enable-sbcl
- avoid rpmquery's at build-time

* Sat Oct 22 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-4
- emaxima patch
- follow icon spec


maxima-5.9.2-emaxima.patch:

--- NEW FILE maxima-5.9.2-emaxima.patch ---
--- maxima-5.9.2/interfaces/emacs/emaxima/maxima.el.emaxima	2005-10-22 09:21:00.000000000 -0500
+++ maxima-5.9.2/interfaces/emacs/emaxima/maxima.el	2005-10-22 09:39:14.000000000 -0500
@@ -2759,8 +2759,8 @@
       (save-excursion
         (set-buffer mbuf)
         (setq inferior-maxima-process (get-buffer-process mbuf))
-        (add-to-list 'comint-output-filter-functions
-                     'inferior-maxima-output-filter)
+;        (add-to-list 'comint-output-filter-functions
+;                     'inferior-maxima-output-filter)
 ;        (add-to-list 'comint-output-filter-functions
 ;                     'inferior-maxima-replace-tabs-by-spaces)
         (add-to-list 'comint-output-filter-functions

maxima-5.9.2-evince.patch:

--- NEW FILE maxima-5.9.2-evince.patch ---
--- maxima-5.9.2/interfaces/xmaxima/Tkmaxima/Constants.tcl.evince	2004-10-28 13:26:29.000000000 -0500
+++ maxima-5.9.2/interfaces/xmaxima/Tkmaxima/Constants.tcl	2005-10-22 09:33:46.000000000 -0500
@@ -132,8 +132,8 @@
     text/html  netmath
     text/plain netmath
     image/gif  netmath
-    application/postscript "ghostview -safer %s"
-    application/pdf "acroread %s"
+    application/postscript "evince %s"
+    application/pdf "evince %s"
     application/x-dvi "xdvi %s"
 }
 set maxima_priv(imagecounter) 0
--- maxima-5.9.2/src/plot.lisp.evince	2005-09-25 14:38:48.000000000 -0500
+++ maxima-5.9.2/src/plot.lisp	2005-10-22 09:36:05.000000000 -0500
@@ -71,7 +71,7 @@
 			 "set size 1.5, 1.5;set term postscript eps enhanced color solid 24")
 			))
 
-(defvar $viewps_command  "(ghostview \"~a\")")
+(defvar $viewps_command  "(evince \"~a\")")
 
 ;;(defvar $viewps_command  "(gs -I. -Q  ~a)")
 


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/maxima.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- maxima.spec	18 Oct 2005 14:19:56 -0000	1.11
+++ maxima.spec	28 Oct 2005 19:10:40 -0000	1.12
@@ -3,7 +3,7 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 3%{?dist} 
+Release: 6%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -17,13 +17,13 @@
 
 %ifarch %{ix86} x86_64
 %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"
 %define _enable_gcl --enable-gcl 
 %endif
-# sbcl build fails: http://bugzilla.redhat.com/bugzilla/170026 
-#define _enable_sbcl --enable-sbcl 
+%define _enable_sbcl --enable-sbcl 
 %endif
 
 %ifarch ppc
@@ -42,10 +42,14 @@
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
 Patch1: maxima-5.9.2-htmlview.patch
-# (mysterious?) xemacs patch
+# (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
 Patch3: maxima-5.9.2-sbcl-disable-debugger.patch
+# ghostview -> evince (ps/pdf viewer)
+Patch4: maxima-5.9.2-evince.patch
+# emaxima fix from Camm Maguire
+Patch5: maxima-5.9.2-emaxima.patch
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -90,15 +94,16 @@
 %{name} lisp source code.
 
 %if "%{?_enable_clisp:1}" == "1"
-# to workaround mysterious(?) "cpio: MD5 sum mismatch" errors on this subpkg
+# to workaround mysterious(?) "cpio: MD5 sum mismatch" errors when installing this subpkg
 %define __prelink_undo_cmd %{nil}
 %define _with_clisp_runtime --with-clisp-runtime=%{_libdir}/clisp/base/lisp.run
 %package runtime-clisp
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-%define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
-Requires: clisp >= %{clisp_ver}
+# To appease those who are paranoid about rpm queries at build time
+#define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
+Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
@@ -135,9 +140,10 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl 
-%define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )}
-Requires: sbcl >= %{sbcl_ver}
+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 )}
+Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
@@ -153,7 +159,11 @@
 install -p -m644 %{SOURCE10} .
 
 %patch1 -p1 -b .htmlview
-%patch2 -p1 -b .xemacs
+#patch2 -p1 -b .xemacs
+%if "%{?fedora}" > "3"
+%patch4 -p1 -b .evince
+%endif
+%patch5 -p1 -b .emaxima
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -199,17 +209,17 @@
 popd
 
 
-%check || :
+%check 
 make check
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # app icon
-install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -p -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/maxima.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
@@ -259,6 +269,15 @@
   [ -x /usr/bin/texhash ] && /usr/bin/texhash 2> /dev/null ||:
 fi
 
+%post gui
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+%postun gui
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -284,7 +303,7 @@
 # emaxima     
 %{_datadir}/maxima/%{version}/emacs
 %{_datadir}/emacs/site-lisp/*
-%{_datadir}/xemacs/site-packages/lisp/*
+%{_datadir}/xemacs/site-packages/*
 %{_datadir}/texmf/tex/latex/emaxima/
 
 %files src
@@ -296,7 +315,7 @@
 %{_bindir}/xmaxima
 %{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*.png
+%{_datadir}/icons/hicolor/*/*
 
 %if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp
@@ -332,7 +351,15 @@
 
 
 %changelog
-* Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-3
+* Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-6
+- --enable-sbcl
+- avoid rpmquery's at build-time
+
+* Sat Oct 22 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-4
+- emaxima patch
+- follow icon spec
+
+* Wed Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-3
 - --with-default-lisp=clisp
 - --with-clisp-runtime=%%_libdir/clisp/base/lisp.run
 


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/xmaxima.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmaxima.desktop	6 Sep 2005 17:56:03 -0000	1.1
+++ xmaxima.desktop	28 Oct 2005 19:10:40 -0000	1.2
@@ -2,7 +2,7 @@
 Name=xmaxima
 Comment=Symbolic Computation Program
 Exec=xmaxima
-Icon=maxima.png
+Icon=maxima
 MimeType=
 Type=Application
 Categories=Application;Scientific;Education;Math;