- Update to 0.87.7 and fix up the defaults to use numpy

- Force build of tkagg backend without X server
- Use src.rpm from Jef Spaleta, closes bug 216578

.cvsignore

@@ -0,0 +1 @@
+matplotlib-0.87.7.tar.gz

.gitignore

@@ -1 +0,0 @@
-matplotlib-0.90.0.tar.gz

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: python-matplotlib
+# $Id$
+NAME := python-matplotlib
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

matplotlib-0.87.7-pygtk-check.patch

@@ -1,25 +0,0 @@
---- matplotlib-0.87.7/setup.py.pygtk	2006-12-05 11:13:58.000000000 -0700
-+++ matplotlib-0.87.7/setup.py	2006-12-05 11:31:22.000000000 -0700
-@@ -207,8 +207,9 @@
-         print 'GTK requires pygtk'
-         BUILD_GTK = 0
-     except RuntimeError:
--        print 'pygtk present but import failed'
--        BUILD_GTK = 0
-+        BUILD_GTK = 1
-+        build_gdk(ext_modules, packages, NUMERIX)
-+        rc['backend'] = 'GTK'
-     else:
-         version = (2,2,0)
-         if gtk.pygtk_version < version:
-@@ -228,7 +229,9 @@
-         BUILD_GTKAGG=0
-     except RuntimeError:
-         print 'pygtk present but import failed'
--        BUILD_GTKAGG = 0
-+        BUILD_GTKAGG = 1
-+        build_gtkagg(ext_modules, packages, NUMERIX)
-+        rc['backend'] = 'GTKAgg'
-     else:
-         version = (2,2,0)
-         if gtk.pygtk_version < version:

python-matplotlib.spec

@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.90.0
+Version:        0.87.7
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -11,14 +11,13 @@ URL:            http://sourceforge.net/projects/matplotlib
 Source0:        http://dl.sf.net/matplotlib/matplotlib-%{version}.tar.gz
 Patch0:         matplotlib-0.87.7-matplotlibrc.patch
 Patch1:         matplotlib-0.87.7-tkagg-check.patch
-Patch2:         matplotlib-0.87.7-pygtk-check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
 BuildRequires:  pygtk2-devel, gtk2-devel, tkinter, tk-devel
 BuildRequires:  python-numeric, pytz, python-dateutil, numpy, python-numarray
-Requires:       numpy, pytz, python-dateutil
+Requires:       python-numeric, pytz, python-dateutil
-Requires:       pycairo >= 1.2.0
+Requires:       pycairo >= 1.0.2
 
 
 %description
@@ -41,8 +40,7 @@ Requires:       tkinter
 %prep
 %setup -q -n matplotlib-%{version}
 %patch0 -p1 -b .matplotlibrc
-%patch1 -p1 -b .tkagg
+%patch1 -p1 -b setup.py 
-%patch2 -p1 -b .pygtk
 chmod -x images/*.svg
 
 %build
@@ -61,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README license/LICENSE license/LICENSE_enthought.txt
 %doc license/LICENSE_PAINT license/LICENSE_PIL
 %doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
-%doc NUMARRAY_ISSUES PKG-INFO TODO examples
+%doc NUMARRAY_ISSUES PKG-INFO TODO
 %{python_sitearch}/matplotlib/
 %{python_sitearch}/pylab.py*
 %exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
@@ -75,17 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Apr  2 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.0-1
+* Tue Nov  21 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.7-1
-- Update to 0.90.0
-
-* Tue Jan  5 2007 Orion Poplawski <orion@cora.nwra.com> 0.87.7-3
-- Add examples to %docs
-
-* Tue Dec  5 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.7-2
-- Force build of gtk/gtkagg backends in mock (bug #218153)
-- Change Requires from python-numeric to numpy (bug #218154)
-
-* Tue Nov 21 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.7-1
 - Update to 0.87.7 and fix up the defaults to use numpy
 - Force build of tkagg backend without X server
 - Use src.rpm from Jef Spaleta, closes bug 216578

sources

@@ -1 +1 @@
-31ea12395826080b5be9c1e292cda6f1  matplotlib-0.90.0.tar.gz
+cca3d3a644c1a84d6dcf4af8a9856b7b  matplotlib-0.87.7.tar.gz