Update to 0.90.1

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

.cvsignore

@@ -1 +1 @@
-matplotlib-0.87.2.tar.gz
+matplotlib-0.90.1.tar.gz

branch

@@ -0,0 +1 @@
+EL-5

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.90.1-setup.patch

@@ -0,0 +1,53 @@
+--- matplotlib-0.90.1/setup.py.tkagg	2007-06-04 10:34:46.000000000 -0600
++++ matplotlib-0.90.1/setup.py	2007-06-04 10:54:44.000000000 -0600
+@@ -28,13 +28,13 @@
+ # it.  It makes very nice antialiased output and also supports alpha
+ # blending
+ BUILD_AGG          = 1
+-BUILD_GTKAGG       = 'auto'
+-BUILD_GTK          = 'auto'
++BUILD_GTKAGG       = 1
++BUILD_GTK          = 1
+ 
+ # build TK GUI with Agg renderer ; requires Tkinter Python extension
+ # and Tk includes
+ # Use False or 0 if you don't want to build
+-BUILD_TKAGG        = 'auto'
++BUILD_TKAGG        = 1
+ 
+ # build wxPython extension code to efficiently blit agg into wx.  Only
+ # needed for wxpython <2.8 if you plan on doing animations
+@@ -226,11 +226,11 @@
+ 
+ havegtk.gotit = None
+ 
+-if BUILD_GTK and havegtk():
++if BUILD_GTK:
+     build_gdk(ext_modules, packages, NUMERIX)
+     rc['backend'] = 'GTK'
+ 
+-if BUILD_GTKAGG and havegtk():
++if BUILD_GTKAGG:
+     BUILD_AGG = 1
+     build_gtkagg(ext_modules, packages, NUMERIX)
+     rc['backend'] = 'GTKAgg'
+@@ -245,16 +245,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,23 @@
 %{!?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.2
+Version:        0.90.1
 Release:        1%{?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
+Source0:        http://downloads.sourceforge.net/matplotlib/matplotlib-%{version}.tar.gz
+Patch0:         matplotlib-0.87.7-matplotlibrc.patch
+Patch1:         matplotlib-0.90.1-setup.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:       pycairo >= 1.0.2
+Requires:       numpy, pytz, python-dateutil
+Requires:       pycairo >= 1.2.0
 
 
 %description
@@ -38,8 +39,9 @@ Requires:       tkinter
 
 %prep
 %setup -q -n matplotlib-%{version}
-%patch -p1 -b .matplotlibrc
-chmod -x images/*.svg
+%patch0 -p1 -b .matplotlibrc
+%patch1 -p1 -b .setup
+chmod -x lib/matplotlib/mpl-data/images/*.svg
 
 %build
 %{__python} setup.py build
@@ -57,39 +59,53 @@ 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
-%dir %{python_sitearch}/matplotlib
-%{python_sitearch}/matplotlib/*.py
-%{python_sitearch}/matplotlib/*.pyc
-%ghost %{python_sitearch}/matplotlib/*.pyo
-%{python_sitearch}/matplotlib/*.so
-%dir %{python_sitearch}/matplotlib/backends
-%{python_sitearch}/matplotlib/backends/*.py
-%{python_sitearch}/matplotlib/backends/*.pyc
-%ghost %{python_sitearch}/matplotlib/backends/*.pyo
-%{python_sitearch}/matplotlib/backends/*.so
-%{python_sitearch}/matplotlib/enthought/
-%{python_sitearch}/matplotlib/ft2font.so
-%{python_sitearch}/matplotlib/mpl-data/
-%{python_sitearch}/matplotlib/numerix/
-%{python_sitearch}/matplotlib/toolkits/
-%{python_sitearch}/pylab.py
-%{python_sitearch}/pylab.pyc
-%ghost %{python_sitearch}/pylab.pyo
+%doc NUMARRAY_ISSUES PKG-INFO TODO examples
+%{python_sitearch}/matplotlib/
+%{python_sitearch}/pylab.py*
 %exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
 %exclude %{python_sitearch}/matplotlib/backends/tkagg.*
 %exclude %{python_sitearch}/matplotlib/backends/_tkagg.so
 
 %files tk
-%{python_sitearch}/matplotlib/backends/backend_tkagg.py
-%{python_sitearch}/matplotlib/backends/backend_tkagg.pyc
-%{python_sitearch}/matplotlib/backends/tkagg.py
-%{python_sitearch}/matplotlib/backends/tkagg.pyc
-%ghost %{python_sitearch}/matplotlib/backends/backend_tkagg.pyo
-%ghost %{python_sitearch}/matplotlib/backends/tkagg.pyo
+%{python_sitearch}/matplotlib/backends/backend_tkagg.py*
+%{python_sitearch}/matplotlib/backends/tkagg.py*
 %{python_sitearch}/matplotlib/backends/_tkagg.so
 
+
 %changelog
+* Thu Jun 28 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.1-1
+- Update to 0.90.1
+
+* Mon Apr  2 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-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
+
+* Fri Oct  6 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.6-1
+- Update to 0.87.6
+
+* Thu Sep  7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.5-1
+- Update to 0.87.5
+
+* Thu Jul 27 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.4-1
+- Update to 0.87.4
+
+* Wed Jun  7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.3-1
+- Update to 0.87.3
+
+* Mon May 15 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.2-2
+- Rebuild for new numpy
+
 * Tue Mar  7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.2-1
 - Update to 0.87.2
 

sources

@@ -1 +1 @@
-74dde3c3e33797f56ebd6ca578090f8e  matplotlib-0.87.2.tar.gz
+e1344bd72660e7c9c0b7540a72cc45b8  matplotlib-0.90.1.tar.gz