Update to 0.90.0

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

.cvsignore

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

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:

matplotlib-0.90.1-setup.patch

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

matplotlib-gcc43.patch

@@ -1,63 +0,0 @@
-diff -u -r matplotlib-0.91.2-old/ttconv/pprdrv.h matplotlib-0.91.2/ttconv/pprdrv.h
---- matplotlib-0.91.2-old/ttconv/pprdrv.h	2007-11-29 17:36:53.000000000 -0900
-+++ matplotlib-0.91.2/ttconv/pprdrv.h	2008-03-21 13:58:01.000000000 -0800
-@@ -20,7 +20,7 @@
- */
- 
- #include <vector>
--#include <assert.h>
-+#include <cassert>
- 
- /*
-  * Encapsulates all of the output to write to an arbitrary output 
-diff -u -r matplotlib-0.91.2-old/ttconv/pprdrv_tt2.cpp matplotlib-0.91.2/ttconv/pprdrv_tt2.cpp
---- matplotlib-0.91.2-old/ttconv/pprdrv_tt2.cpp	2007-11-29 17:36:53.000000000 -0900
-+++ matplotlib-0.91.2/ttconv/pprdrv_tt2.cpp	2008-03-21 16:04:49.000000000 -0800
-@@ -31,10 +31,11 @@
- */
- 
- #include "global_defines.h"
--#include <math.h>
--#include <stdlib.h>
--#include <string.h>
--#include <memory.h>
-+#include <cmath>
-+#include <cstdlib>
-+#include <cstdio>
-+#include <cstring>
-+#include <memory>
- #include "pprdrv.h" 
- #include "truetype.h"
- #include <algorithm>
-diff -u -r matplotlib-0.91.2-old/ttconv/pprdrv_tt.cpp matplotlib-0.91.2/ttconv/pprdrv_tt.cpp
---- matplotlib-0.91.2-old/ttconv/pprdrv_tt.cpp	2007-11-29 17:36:53.000000000 -0900
-+++ matplotlib-0.91.2/ttconv/pprdrv_tt.cpp	2008-03-21 15:57:42.000000000 -0800
-@@ -23,9 +23,9 @@
- */
- 
- #include "global_defines.h"
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
- #include "pprdrv.h"
- #include "truetype.h"
- #include <sstream>
-diff -u -r matplotlib-0.91.2-old/ttconv/ttutil.cpp matplotlib-0.91.2/ttconv/ttutil.cpp
---- matplotlib-0.91.2-old/ttconv/ttutil.cpp	2007-11-29 17:36:53.000000000 -0900
-+++ matplotlib-0.91.2/ttconv/ttutil.cpp	2008-03-24 11:25:06.000000000 -0800
-@@ -8,9 +8,9 @@
- /* (c) Frank Siegert 1996 */
- 
- #include "global_defines.h"
--#include <stdio.h>
--#include <stdarg.h>
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdarg>
-+#include <cstdlib>
- #include "pprdrv.h"
- 
- #if DEBUG_TRUETYPE

python-matplotlib.spec

@@ -1,21 +1,22 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.98.5.2
+Version:        0.90.0
 Release:        1%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
-License:        Python
+License:        Python Software Foundation License 
 URL:            http://sourceforge.net/projects/matplotlib
-Source0:        http://downloads.sourceforge.net/matplotlib/matplotlib-%{version}.tar.gz
-Source1:        setup.cfg
-Patch0:         matplotlib-gcc43.patch
+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:  pytz, python-dateutil, numpy
+BuildRequires:  python-numeric, pytz, python-dateutil, numpy, python-numarray
 Requires:       numpy, pytz, python-dateutil
 Requires:       pycairo >= 1.2.0
 
@@ -39,33 +40,29 @@ Requires:       tkinter
 
 %prep
 %setup -q -n matplotlib-%{version}
-#%patch0 -p1
-chmod -x lib/matplotlib/mpl-data/images/*.svg
+%patch0 -p1 -b .matplotlibrc
+%patch1 -p1 -b .tkagg
+%patch2 -p1 -b .pygtk
+chmod -x images/*.svg
 
 %build
-cp %{SOURCE1} ./setup.cfg
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py
-rm -rf $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/mpl-data/fonts
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt license/LICENSE license/LICENSE_enthought.txt
+%doc README license/LICENSE license/LICENSE_enthought.txt
 %doc license/LICENSE_PAINT license/LICENSE_PIL
-%doc CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
-%doc PKG-INFO TODO examples
-%if 0%{?fedora} >= 9
-%{python_sitearch}/*egg-info
-%endif
+%doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
+%doc NUMARRAY_ISSUES PKG-INFO TODO examples
 %{python_sitearch}/matplotlib/
-%{python_sitearch}/mpl_toolkits/
 %{python_sitearch}/pylab.py*
 %exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
 %exclude %{python_sitearch}/matplotlib/backends/tkagg.*
@@ -78,61 +75,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Dec 22 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-1
-- Latest upstream release
-- Strip out included fonts
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.98.3-2
-- Rebuild for Python 2.6
-
-* Wed Aug  6 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.3-1
-- Latest upstream release
-
-* Fri Jul  1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.1-1
-- Latest upstream release
-
-* Fri Mar  21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-2
-- gcc43 cleanups
-
-* Fri Mar  21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-1
-- New upstream version
-- Adding Fedora specific setup.cfg from included template
-- removed numarry and numerics build requirements
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.90.1-6
-- Autorebuild for GCC 4.3
-
-* Fri Jan  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-5
-- Fixed typo in spec.
-
-* Fri Jan  4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-4
-- Support for Python Eggs for F9+
-
-* Thu Jan  3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-3
-- Rebuild for new Tcl 8.5
-
-* Thu Aug 23 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.1-2
-- Update license tag to Python
-- Rebuild for BuildID
-
-* Mon Jun 04 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.1-1
-- Update to 0.90.1
-
-* 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
+* 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-4
+* Tue Jan  5 2007 Orion Poplawski <orion@cora.nwra.com> 0.87.7-3
 - 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)

setup.cfg

@@ -1,81 +0,0 @@
-# Rename this file to setup.cfg to modify matplotlib's
-# build options.
-
-[egg_info]
-tag_svn_revision = 1
-
-[status]
-# To suppress display of the dependencies and their versions
-# at the top of the build log, uncomment the following line:
-#suppress = True
-#
-# Uncomment to insert lots of diagnostic prints in extension code
-#verbose = True
-
-[provide_packages]
-# By default, matplotlib checks for a few dependencies and
-# installs them if missing. This feature can be turned off
-# by uncommenting the following lines. Acceptible values are:
-#     True: install, overwrite an existing installation
-#     False: do not install
-#     auto: install only if the package is unavailable. This
-#           is the default behavior
-#
-## Date/timezone support:
-#pytz = False
-#dateutil = False
-#
-## Experimental config package support:
-enthought.traits = False
-configobj = False
-
-[gui_support]
-# Matplotlib supports multiple GUI toolkits, including Cocoa,
-# GTK, Fltk, Qt, Qt4, Tk, and WX. Support for many of these
-# toolkits requires AGG, the Anti-Grain Geometry library, which
-# is provided by matplotlib and built by default.
-#
-# Some backends are written in pure Python, and others require
-# extension code to be compiled. By default, matplotlib checks
-# for these GUI toolkits during installation and, if present,
-# compiles the required extensions to support the toolkit. GTK
-# support requires the GTK runtime environment and PyGTK. Wx
-# support requires wxWidgets and wxPython. Tk support requires
-# Tk and Tkinter. The other GUI toolkits do not require any
-# extension code, and can be used as long as the libraries are
-# installed on your system.
-#
-# You can uncomment any the following lines if you know you do
-# not want to use the GUI toolkit. Acceptible values are:
-#     True: build the extension. Exits with a warning if the
-#           required dependencies are not available
-#     False: do not build the extension
-#     auto: build if the required dependencies are available,
-#           otherwise skip silently. This is the default
-#           behavior
-#
-gtk = True
-gtkagg = True
-tkagg = True
-wxagg = False
-
-[rc_options]
-# User-configurable options
-#
-# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg,
-# GTKCairo, FltkAgg, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
-#
-# The Agg, Ps, Pdf and SVG backends do not require external
-# dependencies. Do not choose GTK, GTKAgg, GTKCairo, TkAgg or WXAgg if
-# you have disabled the relevent extension modules.  Agg will be used
-# by default.
-#
-backend = GTKAgg
-#
-# The numerix module was historically used to provide
-# compatibility between the Numeric, numarray, and NumPy array
-# packages. Now that NumPy has emerge as the universal array
-# package for python, numerix is not really necessary and is
-# maintained to provide backward compatibility. Do not change
-# this unless you have a compelling reason to do so.
-numerix = numpy

sources

@@ -1 +1 @@
-3e8210ec8bb71a18962ec8b43688509c  matplotlib-0.98.5.2.tar.gz
+31ea12395826080b5be9c1e292cda6f1  matplotlib-0.90.0.tar.gz