rpms/python-matplotlib/devel matplotlib-0.87.7-matplotlibrc.patch, NONE, 1.1 matplotlib-0.87.7-tkagg-check.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 python-matplotlib.spec, 1.20, 1.21 sources, 1.13, 1.14 matplotlib-0.87-matplotlibrc.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17354

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Added Files:
	matplotlib-0.87.7-matplotlibrc.patch 
	matplotlib-0.87.7-tkagg-check.patch 
Removed Files:
	matplotlib-0.87-matplotlibrc.patch 
Log Message:
- 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


matplotlib-0.87.7-matplotlibrc.patch:

--- NEW FILE matplotlib-0.87.7-matplotlibrc.patch ---
--- 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'] = 'numpy'
+rc['backend'] = 'GTKAgg'
 if sys.platform=='win32':
     rc = dict(backend='TkAgg', numerix='Numeric')
 template = file('matplotlibrc.template').read()

matplotlib-0.87.7-tkagg-check.patch:

--- NEW FILE matplotlib-0.87.7-tkagg-check.patch ---
--- 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:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	6 Oct 2006 17:32:24 -0000	1.13
+++ .cvsignore	21 Nov 2006 15:36:32 -0000	1.14
@@ -1 +1 @@
-matplotlib-0.87.6.tar.gz
+matplotlib-0.87.7.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- python-matplotlib.spec	6 Oct 2006 17:32:24 -0000	1.20
+++ python-matplotlib.spec	21 Nov 2006 15:36:32 -0000	1.21
@@ -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.87.6
+Version:        0.87.7
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -9,7 +9,8 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
@@ -38,7 +39,8 @@
 
 %prep
 %setup -q -n matplotlib-%{version}
-%patch -p1 -b .matplotlibrc
+%patch0 -p1 -b .matplotlibrc
+%patch1 -p1 -b setup.py 
 chmod -x images/*.svg
 
 %build
@@ -71,6 +73,11 @@
 
 
 %changelog
+* Tue Nov  21 2006 Orion Poplawski <orion at 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 at cora.nwra.com> 0.87.6-1
 - Update to 0.87.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	6 Oct 2006 17:32:24 -0000	1.13
+++ sources	21 Nov 2006 15:36:32 -0000	1.14
@@ -1 +1 @@
-30c30e10d2338c56ae5b31f0adf325f5  matplotlib-0.87.6.tar.gz
+cca3d3a644c1a84d6dcf4af8a9856b7b  matplotlib-0.87.7.tar.gz


--- matplotlib-0.87-matplotlibrc.patch DELETED ---