Rebuild for Tcl/Tk downgrade

- Change Requires from python-numeric to numpy (bug #218154)

.cvsignore

@@ -1 +1 @@
-matplotlib-0.87.6.tar.gz
+matplotlib-0.90.0.tar.gz

matplotlib-0.87.7-matplotlibrc.patch

@@ -6,7 +6,7 @@
  # defaults, eg
 -#rc['numerix'] = numpy
 -#rc['backend'] = GTKAgg
-+rc['numerix'] = 'Numeric'
++rc['numerix'] = 'numpy'
 +rc['backend'] = 'GTKAgg'
  if sys.platform=='win32':
      rc = dict(backend='TkAgg', numerix='Numeric')

matplotlib-0.87.7-pygtk-check.patch

@@ -0,0 +1,25 @@
+--- 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:

matplotlib-0.87.7-tkagg-check.patch

@@ -0,0 +1,22 @@
+--- matplotlib-0.87.7/setup.py.fix	2006-11-20 19:49:56.000000000 -0900
++++ matplotlib-0.87.7/setup.py	2006-11-20 19:51:03.000000000 -0900
+@@ -251,16 +251,9 @@
+         print 'Tkinter present but import failed'
+         BUILD_TKAGG = 0
+     else:
+-        try:
+-            tk = Tkinter.Tk()
+-            tk.withdraw()
+-        except Tkinter.TclError:
+-            print 'Tkinter present, but window failed to open'
+-            BUILD_TKAGG = 0
+-        else:
+-            BUILD_AGG = 1
+-            build_tkagg(ext_modules, packages, NUMERIX)
+-            rc['backend'] = 'TkAgg'
++        BUILD_AGG = 1
++        build_tkagg(ext_modules, packages, NUMERIX)
++        rc['backend'] = 'TkAgg'
+ 
+ if BUILD_WXAGG:
+     try:

python-matplotlib.spec

@@ -1,22 +1,24 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.87.6
+Version:        0.90.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
 License:        Python Software Foundation License 
 URL:            http://sourceforge.net/projects/matplotlib
 Source0:        http://dl.sf.net/matplotlib/matplotlib-%{version}.tar.gz
-Patch0:         matplotlib-0.87-matplotlibrc.patch
+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:       python-numeric, pytz, python-dateutil
+Requires:       numpy, pytz, python-dateutil
-Requires:       pycairo >= 1.0.2
+Requires:       pycairo >= 1.2.0
 
 
 %description
@@ -38,7 +40,9 @@ Requires:       tkinter
 
 %prep
 %setup -q -n matplotlib-%{version}
-%patch -p1 -b .matplotlibrc
+%patch0 -p1 -b .matplotlibrc
+%patch1 -p1 -b .tkagg
+%patch2 -p1 -b .pygtk
 chmod -x images/*.svg
 
 %build
@@ -57,7 +61,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
+%doc NUMARRAY_ISSUES PKG-INFO TODO examples
 %{python_sitearch}/matplotlib/
 %{python_sitearch}/pylab.py*
 %exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
@@ -71,6 +75,30 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 14 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.0-2
+- Rebuild for Tcl/Tk downgrade
+
+* Sat Feb 10 2007 Jef Spaleta <jspaleta@gmail.com> 0.90.0-2
+- Release bump for rebuild against new tk 
+
+* Fri Feb 09 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.0-1
+- Update to 0.90.0
+
+* Tue Jan  5 2007 Orion Poplawski <orion@cora.nwra.com> 0.87.7-4
+- Add examples to %docs
+
+* Mon Dec 11 2006 Jef Spaleta <jspaleta@gmail.com> 0.87.7-3
+- Release bump for rebuild against python 2.5 in devel tree
+
+* 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
+
 * Fri Oct  6 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.6-1
 - Update to 0.87.6
 

sources

@@ -1 +1 @@
-30c30e10d2338c56ae5b31f0adf325f5  matplotlib-0.87.6.tar.gz
+31ea12395826080b5be9c1e292cda6f1  matplotlib-0.90.0.tar.gz