rpms/wxMaxima/FC-6 wxMaxima-0.7.1-old_gnuplot.patch, NONE, 1.1 wxMaxima.spec, 1.7, 1.8

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/wxMaxima/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18884

Modified Files:
	wxMaxima.spec 
Added Files:
	wxMaxima-0.7.1-old_gnuplot.patch 
Log Message:
* Mon Apr 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.1-3
- wxMaxima-0.7.1-old_gnuplot.patch (#235155)


wxMaxima-0.7.1-old_gnuplot.patch:

--- NEW FILE wxMaxima-0.7.1-old_gnuplot.patch ---
--- wxMaxima-0.7.1/data/wxmathml.lisp.old_gnuplot	2006-12-19 03:16:50.000000000 -0600
+++ wxMaxima-0.7.1/data/wxmathml.lisp	2007-04-09 08:57:13.000000000 -0500
@@ -890,10 +890,18 @@
 
 (defmvar $wxplot_size '((mlist simp) 400 250))
 
+;; newer gnuplot syntax
+;(defun $wxplot_preamble ()
+;  (format nil "set terminal png size ~d,~d; set zeroaxis;"
+;         ($first $wxplot_size)
+;         ($second $wxplot_size)))
+;; older gnuplot syntax
 (defun $wxplot_preamble ()
-  (format nil "set terminal png size ~d,~d; set zeroaxis;"
-	  ($first $wxplot_size)
-	  ($second $wxplot_size)))
+  (let ((frmt "set terminal png picsize ~d ~d; set zeroaxis;"))
+    (format nil frmt
+            ($first $wxplot_size)
+            ($second $wxplot_size))))
+
 
 (defun $wxplot2d (&rest args)
   (let ((preamble ($wxplot_preamble))


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/FC-6/wxMaxima.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wxMaxima.spec	23 Feb 2007 19:38:54 -0000	1.7
+++ wxMaxima.spec	9 Apr 2007 14:12:14 -0000	1.8
@@ -5,13 +5,15 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: wxMaxima-0.7.1-old_gnuplot.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
 BuildRequires: libxml2-devel
@@ -29,6 +31,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .old_gnuplot
+
 ## wxmaxima.desktop fixups
 # do (some) Categories munging here, some versions of desktop-file-install 
 # (*cough rhel4*) truncate Categories if --remove-category'd items is a
@@ -94,6 +98,9 @@
 
 
 %changelog
+* Mon Apr 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.1-3
+- wxMaxima-0.7.1-old_gnuplot.patch (#235155)
+
 * Fri Feb 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.1-2
 - wxMaxima-0.7.1
 - drop upstreamed patches