dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-matplotlib-0.90.1.tar.gz

.gitignore

@@ -0,0 +1 @@
+matplotlib-0.90.0.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: python-matplotlib
-# $Id$
-NAME := python-matplotlib
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

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:

python-matplotlib.spec

@@ -1,16 +1,17 @@
 %{!?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.1
-Release:        2%{?dist}
+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
+Source0:        http://dl.sf.net/matplotlib/matplotlib-%{version}.tar.gz
 Patch0:         matplotlib-0.87.7-matplotlibrc.patch
-Patch1:         matplotlib-0.90.1-setup.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
@@ -40,8 +41,9 @@ Requires:       tkinter
 %prep
 %setup -q -n matplotlib-%{version}
 %patch0 -p1 -b .matplotlibrc
-%patch1 -p1 -b .setup
-chmod -x lib/matplotlib/mpl-data/images/*.svg
+%patch1 -p1 -b .tkagg
+%patch2 -p1 -b .pygtk
+chmod -x images/*.svg
 
 %build
 %{__python} setup.py build
@@ -73,28 +75,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* 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)

sources

@@ -1 +1 @@
-e1344bd72660e7c9c0b7540a72cc45b8  matplotlib-0.90.1.tar.gz
+31ea12395826080b5be9c1e292cda6f1  matplotlib-0.90.0.tar.gz