Update to 0.87.2

- Add BR numpy and python-numarray
- Add patch to keep Numeric as the default numerix package
- Add BR tkinter and tk-devel for TkInter backend
- Make separate package for Tk backend

.cvsignore

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

matplotlib-0.87-matplotlibrc.patch

@@ -0,0 +1,13 @@
+--- matplotlib-0.87/setup.py.orig	2006-02-14 11:11:32.000000000 -0700
++++ matplotlib-0.87/setup.py	2006-02-27 15:19:28.000000000 -0700
+@@ -258,8 +258,8 @@
+ 
+ # packagers: set rc['numerix'] and rc['backend'] here to override the auto
+ # defaults, eg
+-#rc['numerix'] = numpy
+-#rc['backend'] = GTKAgg
++rc['numerix'] = 'Numeric'
++rc['backend'] = 'GTKAgg'
+ if sys.platform=='win32':
+     rc = dict(backend='TkAgg', numerix='Numeric')
+ template = file('matplotlibrc.template').read()

python-matplotlib.spec

@@ -1,16 +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.82
-Release:        2%{?dist}
+Version:        0.87.2
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
-BuildRequires:  python-numeric, pygtk2-devel, gtk2-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
+
 
 %description
 Matplotlib is a pure python plotting library with the goal of making
@@ -18,30 +25,120 @@ publication quality plots using a syntax familiar to matlab users. The
 library uses Numeric for handling large data sets and supports a variety
 of output backends
 
+
+%package        tk
+Summary:        Tk backend for python-matplotlib
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       tkinter
+
+%description    tk
+%{summary}
+
+
 %prep
 %setup -q -n matplotlib-%{version}
+%patch -p1 -b .matplotlibrc
+chmod -x images/*.svg
 
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
+%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
-%files -f INSTALLED_FILES
+%files
 %defattr(-,root,root,-)
 %doc README license/LICENSE license/LICENSE_enthought.txt
-%doc license/LICENSE_PAINT license/LICENSE_PIL license/PYTZ_LICENSE.txt
+%doc license/LICENSE_PAINT license/LICENSE_PIL
 %doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
 %doc NUMARRAY_ISSUES PKG-INFO TODO
-%dir %{_libdir}/python2.4/site-packages/matplotlib
-%dir %{_datadir}/matplotlib
+%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
+%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/_tkagg.so
 
 %changelog
+* Tue Mar  7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.2-1
+- Update to 0.87.2
+
+* Tue Mar  7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.1-1
+- Update to 0.87.1
+- Add pycairo >= 1.0.2 requires (FC5+ only)
+
+* Fri Feb 24 2006 Orion Poplawski <orion@cora.nwra.com> 0.87-1
+- Update to 0.87
+- Add BR numpy and python-numarray
+- Add patch to keep Numeric as the default numerix package
+- Add BR tkinter and tk-devel for TkInter backend
+- Make separate package for Tk backend
+
+* Tue Jan 10 2006 Orion Poplawski <orion@cora.nwra.com> 0.86-1
+- Update to 0.86
+
+* Thu Dec 22 2005 Orion Poplawski <orion@cora.nwra.com> 0.85-2
+- Rebuild
+
+* Sun Nov 20 2005 Orion Poplawski <orion@cora.nwra.com> 0.85-1
+- New upstream version 0.85
+
+* Mon Sep 19 2005 Orion Poplawski <orion@cora.nwra.com> 0.84-1
+- New upstream version 0.84
+
+* Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-3
+- bump release 
+
+* Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-2
+- Add Requires: python-numeric, pytz, python-dateutil
+
+* Fri Jul 29 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-1
+- New upstream version matplotlib 0.83.2
+
+* Thu Jul 28 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.1-2
+- Bump rel to fix botched tag
+
+* Thu Jul 28 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.1-1
+- New upstream version matplotlib 0.83.1
+
+* Tue Jul 05 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-4
+- BuildRequires: pytz, python-dateutil - use upstream
+- Don't use INSTALLED_FILES, list dirs
+- Fix execute permissions
+
+* Fri Jul 01 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-3
+- Use %%{python_sitearch}
+
 * Thu Jun 30 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-2
 - Rename to python-matplotlib
 - Remove unneeded Requires: python

sources

@@ -1 +1 @@
-a5ef59a9eed934708eedef5a0125d8d8  matplotlib-0.82.tar.gz
+74dde3c3e33797f56ebd6ca578090f8e  matplotlib-0.87.2.tar.gz