- Rebuilt for

https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild

.cvsignore

@@ -1 +1 @@
-matplotlib-0.90.1.tar.gz
+matplotlib-1.0.0-without-gpc.tar.gz

Makefile

@@ -4,7 +4,7 @@ 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
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

branch

@@ -1 +0,0 @@
-F-8

generate-tarball.sh

@@ -0,0 +1,17 @@
+#! /bin/sh
+
+version=$1
+
+[ -z $version ] && exit 1
+
+dir=matplotlib-${version}
+file=matplotlib-${version}.tar.gz
+result=matplotlib-${version}-without-gpc.tar.gz
+
+rm -rf matplotlib-${version}
+tar xzf $file
+
+rm matplotlib-${version}/agg24/include/agg_conv_gpc.h
+
+rm -f $result
+tar czf $result $dir

matplotlib-gcc43.patch

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

matplotlib_gtk_tooltip.patch

@@ -0,0 +1,81 @@
+--- lib/matplotlib/backends/backend_gtk.py	2010/02/18 14:54:30	8141
++++ lib/matplotlib/backends/backend_gtk.py	2010/03/20 22:49:25	8203
+@@ -17,6 +17,8 @@
+                       % (gtk.pygtk_version + pygtk_version_required))
+ del pygtk_version_required
+ 
++_new_tooltip_api =  (gtk.pygtk_version[1] >= 12)
++
+ import matplotlib
+ from matplotlib import verbose
+ from matplotlib._pylab_helpers import Gcf
+@@ -448,7 +450,7 @@
+                 # diong a blanket catch here, but an not sure what a
+                 # better way is - JDH
+                 verbose.report('Could not load matplotlib icon: %s' % sys.exc_info()[1])
+-                
++
+         self.vbox = gtk.VBox()
+         self.window.add(self.vbox)
+         self.vbox.show()
+@@ -618,7 +620,8 @@
+ 
+     def _init_toolbar2_4(self):
+         basedir = os.path.join(matplotlib.rcParams['datapath'],'images')
+-        self.tooltips = gtk.Tooltips()
++        if not _new_tooltip_api:
++            self.tooltips = gtk.Tooltips()
+ 
+         for text, tooltip_text, image_file, callback in self.toolitems:
+             if text is None:
+@@ -630,7 +633,10 @@
+             tbutton = gtk.ToolButton(image, text)
+             self.insert(tbutton, -1)
+             tbutton.connect('clicked', getattr(self, callback))
+-            tbutton.set_tooltip(self.tooltips, tooltip_text, 'Private')
++            if _new_tooltip_api:
++                tbutton.set_tooltip_text(tooltip_text)
++            else:
++                tbutton.set_tooltip(self.tooltips, tooltip_text, 'Private')
+ 
+         toolitem = gtk.SeparatorToolItem()
+         self.insert(toolitem, -1)
+@@ -760,7 +766,8 @@
+     def _create_toolitems_2_4(self):
+         # use the GTK+ 2.4 GtkToolbar API
+         iconSize = gtk.ICON_SIZE_SMALL_TOOLBAR
+-        self.tooltips = gtk.Tooltips()
++        if not _new_tooltip_api:
++            self.tooltips = gtk.Tooltips()
+ 
+         for text, tooltip_text, image_num, callback, callback_arg, scroll \
+                 in self.toolitems:
+@@ -778,15 +785,22 @@
+                 tbutton.connect('clicked', getattr(self, callback))
+             if scroll:
+                 tbutton.connect('scroll_event', getattr(self, callback))
+-            tbutton.set_tooltip(self.tooltips, tooltip_text, 'Private')
++            if _new_tooltip_api:
++                tbutton.set_tooltip_text(tooltip_text)
++            else:
++                tbutton.set_tooltip(self.tooltips, tooltip_text, 'Private')
+ 
+         # Axes toolitem, is empty at start, update() adds a menu if >=2 axes
+         self.axes_toolitem = gtk.ToolItem()
+         self.insert(self.axes_toolitem, 0)
+-        self.axes_toolitem.set_tooltip (
+-            self.tooltips,
+-            tip_text='Select axes that controls affect',
+-            tip_private = 'Private')
++        if _new_tooltip_api:
++            self.axes_toolitem.set_tooltip_text(
++                                'Select axes that controls affect')
++        else:
++            self.axes_toolitem.set_tooltip (
++                self.tooltips,
++                tip_text='Select axes that controls affect',
++                tip_private = 'Private')
+ 
+         align = gtk.Alignment (xalign=0.5, yalign=0.5, xscale=0.0, yscale=0.0)
+         self.axes_toolitem.add(align)
+

python-matplotlib.spec

@@ -1,15 +1,21 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.91.2
-Release:        1%{?dist}
+Version:        1.0.0
+Release:        2%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
 License:        Python
 URL:            http://sourceforge.net/projects/matplotlib
-Source0:        http://downloads.sourceforge.net/matplotlib/matplotlib-%{version}.tar.gz
+#Modified Sources to remove the one undistributable file
+#See generate-tarball.sh in fedora cvs repository for logic
+#sha1sum matplotlib-1.0.0-without-gpc.tar.gz 
+#c3c2cb82ee122b36977f636948bb4a79b15c03ba  matplotlib-1.0.0-without-gpc.tar.gz
+Source0:        http://downloads.sourceforge.net/matplotlib/matplotlib-%{version}-without-gpc.tar.gz
 Source1:        setup.cfg
+Patch0:         matplotlib-gcc43.patch
+Patch1:         matplotlib_gtk_tooltip.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
@@ -17,7 +23,7 @@ BuildRequires:  pygtk2-devel, gtk2-devel, tkinter, tk-devel
 BuildRequires:  pytz, python-dateutil, numpy
 Requires:       numpy, pytz, python-dateutil
 Requires:       pycairo >= 1.2.0
-
+Requires:       dejavu-sans-fonts
 
 %description
 Matplotlib is a pure python plotting library with the goal of making
@@ -38,6 +44,9 @@ Requires:       tkinter
 
 %prep
 %setup -q -n matplotlib-%{version}
+#%setup -q -n matplotlib-0.99.3
+#%patch0 -p1
+#%patch1 -p0
 chmod -x lib/matplotlib/mpl-data/images/*.svg
 
 %build
@@ -48,20 +57,22 @@ cp %{SOURCE1} ./setup.cfg
 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 license/LICENSE license/LICENSE_enthought.txt
+%doc README.txt license/LICENSE license/LICENSE_enthought.txt
 %doc license/LICENSE_PAINT license/LICENSE_PIL
-%doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
+%doc CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
 %doc PKG-INFO TODO examples
 %if 0%{?fedora} >= 9
 %{python_sitearch}/*egg-info
 %endif
 %{python_sitearch}/matplotlib/
+%{python_sitearch}/mpl_toolkits/
 %{python_sitearch}/pylab.py*
 %exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
 %exclude %{python_sitearch}/matplotlib/backends/tkagg.*
@@ -74,6 +85,56 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Thu Jul 8 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 1.0.0-1
+- New upstream release  
+- Remove undistributable file from bundled agg library 
+
+* Thu Jul 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.3-1
+- New upstream release  
+
+* Thu May 27 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-4
+- Upstream patch to fix deprecated gtk tooltip warning.  
+
+* Mon Apr 12 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-2
+- Bump to rebuild against numpy 1.3  
+
+* Thu Apr 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-1
+- Bump to rebuild against numpy 1.4.0  
+
+* Fri Dec 11 2009 Jon Ciesla <limb@jcomserv.net> - 0.99.1.2
+- Update to 0.99.1.2
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.5.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Mar 06 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-4
+- Fixed font dep after font guideline change
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.5.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Dec 23 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-2
+- Add dep on DejaVu Sans font for default font support
+
+* 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

sources

@@ -1 +1 @@
-7abe21ca9e26df4a44f3208d6007fe16  matplotlib-0.91.2.tar.gz
+b5478c7027e49d7c8e91bd8ddb5f2955  matplotlib-1.0.0-without-gpc.tar.gz