rpms/maxima/devel maxima-5.10.0-xdg-utils.patch, NONE, 1.1 maxima.spec, 1.41, 1.42 maxima-5.10.0-xdg_open.patch, 1.1, NONE maxima-5.9.4-evince.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-serv1029

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.10.0-xdg-utils.patch 
Removed Files:
	maxima-5.10.0-xdg_open.patch maxima-5.9.4-evince.patch 
Log Message:
* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
- update xdg-utils patch (for .dvi handling too)


maxima-5.10.0-xdg-utils.patch:

--- NEW FILE maxima-5.10.0-xdg-utils.patch ---
--- maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl.xdg_open	2006-09-11 10:38:01.000000000 -0500
+++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Menu.tcl	2006-10-02 11:46:43.000000000 -0500
@@ -215,9 +215,9 @@
 	}
     } else {
 	
-	set selectedbrowser mozilla
+	set selectedbrowser xdg-open
 
-	foreach b { mozilla konqueror epiphany firefox netscape } {
+	foreach b { xdg-open htmlview firefox konqueror mozilla epiphany netscape } {
 	    if { ! [catch {exec which $b} ] } {
 		set selectedbrowser $b
 		break } }
--- maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl.xdg_open	2006-08-03 08:21:57.000000000 -0500
+++ maxima-5.10.0/interfaces/xmaxima/Tkmaxima/Constants.tcl	2006-10-02 11:48:30.000000000 -0500
@@ -143,9 +143,9 @@
     image/gif  netmath
     image/png  netmath
     image/jpeg netmath
-    application/postscript "ghostview -safer %s"
-    application/pdf "acroread %s"
-    application/x-dvi "xdvi %s"
+    application/postscript "xdg-open %s"
+    application/pdf "xdg-open %s"
+    application/x-dvi "xdg-open %s"
 }
 set maxima_priv(imagecounter) 0
 
--- maxima-5.10.0/src/plot.lisp.xdg_open	2006-08-26 06:13:40.000000000 -0500
+++ maxima-5.10.0/src/plot.lisp	2006-10-02 11:46:43.000000000 -0500
@@ -75,7 +75,7 @@
                         ((mlist) $plot_realpart nil)
                         ))
 
-(defvar $viewps_command  "(ghostview \"~a\")")
+(defvar $viewps_command  "(xdg-open \"~a\")")
 
 ;; $plot_realpart option is false by default but *plot-realpart* is true because coerce-float-fun
 ;; is used outside of plot package too.


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- maxima.spec	2 Oct 2006 16:01:44 -0000	1.41
+++ maxima.spec	2 Oct 2006 16:55:41 -0000	1.42
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -44,13 +44,11 @@
 Source10: http://starship.python.net/crew/mike/TixMaxima/macref.pdf
 Source11: http://maxima.sourceforge.net/docs/maximabook/maximabook-19-Sept-2004.pdf
 
-Patch1: maxima-5.10.0-xdg_open.patch
+Patch1: maxima-5.10.0-xdg-utils.patch
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
 Patch3: maxima-5.9.4-sbcl-disable-debugger.patch
-# ghostview -> evince (ps/pdf viewer)
-Patch4: maxima-5.9.4-evince.patch
 # emaxima fix from Camm Maguire
 Patch5: maxima-5.9.2-emaxima.patch
 # maxima-runtime-gcl: Unrecoverable error: fault count too high (bug #187647)
@@ -97,7 +95,6 @@
 Obsoletes: %{name}-xmaxima < %{version}-%{release}
 Requires: tk
 Requires: xdg-utils
-#Requires: htmlview
 %description gui
 Tcl/Tk GUI interface for %{name}
 
@@ -185,9 +182,6 @@
 %patch1 -p1 -b .xdg_open
 #patch2 -p1 -b .xemacs
 %patch3 -p1 -b .sbcl-disable-debugger
-%if "%{?fedora}" > "3"
-%patch4 -p1 -b .evince
-%endif
 %patch5 -p1 -b .emaxima
 %if "%{?setarch_hack}" == "1"
 %patch6 -p1 -b .gcl-setarch
@@ -386,8 +380,11 @@
 
 
 %changelog
+* Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
+- update xdg-utils patch (for .dvi handling too)
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-4
-- -gui: htmlview -> xdg-open,Requires: xdg-utils
+- -gui: htmlview -> xdg-open, Requires: xdg-utils
 
 * Tue Sep 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-2
 - respin for sbcl-0.9.17


--- maxima-5.10.0-xdg_open.patch DELETED ---


--- maxima-5.9.4-evince.patch DELETED ---