From c025c6425eb472f19529cbfb77d6393f76d136d8 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Apr 09 2007 19:41:01 +0000
Subject: - wxMaxima-0.7.2


---

diff --git a/.cvsignore b/.cvsignore
index 8976917..f30a3cb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,3 @@
+clog
 wxMaxima-0.7.1.tar.gz
+wxMaxima-0.7.2.tar.gz
diff --git a/sources b/sources
index b3a329a..1cd7b9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-005f5bffe74caa987f66af2084d9df45  wxMaxima-0.7.1.tar.gz
+4a0c6099a60d5f54e262cc505d8caca7  wxMaxima-0.7.2.tar.gz
diff --git a/wxMaxima-0.7.1-old_gnuplot.patch b/wxMaxima-0.7.1-old_gnuplot.patch
deleted file mode 100644
index 432eb9c..0000000
--- a/wxMaxima-0.7.1-old_gnuplot.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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))
diff --git a/wxMaxima-0.7.2-old_gnuplot.patch b/wxMaxima-0.7.2-old_gnuplot.patch
new file mode 100644
index 0000000..8a9e72a
--- /dev/null
+++ b/wxMaxima-0.7.2-old_gnuplot.patch
@@ -0,0 +1,11 @@
+--- wxMaxima-0.7.2/data/wxmathml.lisp.old_gnuplot	2007-04-02 10:30:35.000000000 -0500
++++ wxMaxima-0.7.2/data/wxmathml.lisp	2007-04-09 14:39:04.000000000 -0500
+@@ -1025,7 +1025,7 @@
+ 
+ (defmvar $wxplot_size '((mlist simp) 400 250))
+ 
+-(defmvar $wxplot_old_gnuplot nil)
++(defmvar $wxplot_old_gnuplot 1)
+ 
+ (defun $wxplot_preamble ()
+   (let ((frmt (if $wxplot_old_gnuplot
diff --git a/wxMaxima.spec b/wxMaxima.spec
index e3be1fd..706967d 100644
--- a/wxMaxima.spec
+++ b/wxMaxima.spec
@@ -4,15 +4,16 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.7.1
-Release: 3%{?dist}
+Version: 0.7.2
+Release: 1%{?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
+# for gnuplot < 4.2
+Patch1: wxMaxima-0.7.2-old_gnuplot.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
@@ -31,7 +32,11 @@ Maxima using wxWidgets.
 %prep
 %setup -q
 
+#if 0%{?fedora} > 7
+## Woo hoo
+#else
 %patch1 -p1 -b .old_gnuplot
+#endif
 
 ## wxmaxima.desktop fixups
 # do (some) Categories munging here, some versions of desktop-file-install 
@@ -98,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.2-1
+- wxMaxima-0.7.2
+
 * Mon Apr 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.1-3
 - wxMaxima-0.7.1-old_gnuplot.patch (#235155)