rpms/python-matplotlib/EL-5 matplotlib-0.90.1-setup.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 python-matplotlib.spec, 1.25, 1.26 sources, 1.15, 1.16 matplotlib-0.87.7-pygtk-check.patch, 1.1, NONE matplotlib-0.87.7-tkagg-check.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/python-matplotlib/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11382

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Added Files:
	matplotlib-0.90.1-setup.patch 
Removed Files:
	matplotlib-0.87.7-pygtk-check.patch 
	matplotlib-0.87.7-tkagg-check.patch 
Log Message:
Update to 0.90.1


matplotlib-0.90.1-setup.patch:

--- NEW FILE matplotlib-0.90.1-setup.patch ---
--- 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:


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-matplotlib/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	2 Apr 2007 16:11:19 -0000	1.15
+++ .cvsignore	28 Jun 2007 22:20:42 -0000	1.16
@@ -1 +1 @@
-matplotlib-0.90.0.tar.gz
+matplotlib-0.90.1.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-matplotlib/EL-5/python-matplotlib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- python-matplotlib.spec	2 Apr 2007 16:11:19 -0000	1.25
+++ python-matplotlib.spec	28 Jun 2007 22:20:42 -0000	1.26
@@ -1,17 +1,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.90.0
+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
+Source0:        http://downloads.sourceforge.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
+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
@@ -41,9 +40,8 @@
 %prep
 %setup -q -n matplotlib-%{version}
 %patch0 -p1 -b .matplotlibrc
-%patch1 -p1 -b .tkagg
-%patch2 -p1 -b .pygtk
-chmod -x images/*.svg
+%patch1 -p1 -b .setup
+chmod -x lib/matplotlib/mpl-data/images/*.svg
 
 %build
 %{__python} setup.py build
@@ -75,6 +73,9 @@
 
 
 %changelog
+* Thu Jun 28 2007 Orion Poplawski <orion at cora.nwra.com> 0.90.1-1
+- Update to 0.90.1
+
 * Mon Apr  2 2007 Orion Poplawski <orion at cora.nwra.com> 0.90.0-1
 - Update to 0.90.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-matplotlib/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	2 Apr 2007 16:11:19 -0000	1.15
+++ sources	28 Jun 2007 22:20:42 -0000	1.16
@@ -1 +1 @@
-31ea12395826080b5be9c1e292cda6f1  matplotlib-0.90.0.tar.gz
+e1344bd72660e7c9c0b7540a72cc45b8  matplotlib-0.90.1.tar.gz


--- matplotlib-0.87.7-pygtk-check.patch DELETED ---


--- matplotlib-0.87.7-tkagg-check.patch DELETED ---