Apply upstream patch for timezone in plotting (bug 735677)

matplotlib-1.0.1-noagg.patch

@@ -1,82 +0,0 @@
-diff -up matplotlib-1.0.1/MANIFEST.in.noagg matplotlib-1.0.1/MANIFEST.in
---- matplotlib-1.0.1/MANIFEST.in.noagg	2010-07-06 19:41:55.000000000 -0600
-+++ matplotlib-1.0.1/MANIFEST.in	2011-05-20 15:45:38.337580769 -0600
-@@ -18,6 +18,5 @@ recursive-include examples *
- recursive-include doc *
- recursive-include src  *.cpp *.c *.h *.m
- recursive-include CXX  *.cxx *.hxx *.c *.h
--recursive-include agg24 *
- recursive-include lib *
- recursive-include ttconv *.cpp *.h
-diff -up matplotlib-1.0.1/setupext.py.noagg matplotlib-1.0.1/setupext.py
---- matplotlib-1.0.1/setupext.py.noagg	2010-07-06 19:41:55.000000000 -0600
-+++ matplotlib-1.0.1/setupext.py	2011-05-20 16:11:56.977764688 -0600
-@@ -104,7 +104,6 @@ BUILT_GDK       = False
- BUILT_PATH      = False
- BUILT_TRI       = False
- 
--AGG_VERSION = 'agg24'
- TCL_TK_CACHE = None
- 
- # for nonstandard installation/build with --prefix variable
-@@ -551,7 +550,8 @@ def add_agg_flags(module):
-     # before adding the freetype flags since -z comes later
-     add_base_flags(module)
-     add_numpy_flags(module)
--    module.include_dirs.extend(['src', '%s/include'%AGG_VERSION, '.'])
-+    module.include_dirs.extend(['src', '/usr/include/agg2', '.'])
-+    module.libraries.append('agg')
- 
-     # put these later for correct link order
-     module.libraries.extend(std_libs)
-@@ -1251,17 +1251,7 @@ def build_agg(ext_modules, packages):
-     global BUILT_AGG
-     if BUILT_AGG: return # only build it if you you haven't already
- 
--    agg = (
--           'agg_trans_affine.cpp',
--           'agg_bezier_arc.cpp',
--           'agg_curves.cpp',
--           'agg_vcgen_dash.cpp',
--           'agg_vcgen_stroke.cpp',
--           'agg_image_filters.cpp',
--           )
--
--    deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
--    deps.extend(['src/mplutils.cpp', 'src/agg_py_transforms.cpp'])
-+    deps = ['src/mplutils.cpp', 'src/agg_py_transforms.cpp']
-     deps.extend(glob.glob('CXX/*.cxx'))
-     deps.extend(glob.glob('CXX/*.c'))
-     temp_copy('src/_backend_agg.cpp', 'src/backend_agg.cpp')
-@@ -1284,15 +1274,7 @@ def build_path(ext_modules, packages):
-     global BUILT_PATH
-     if BUILT_PATH: return # only build it if you you haven't already
- 
--    agg = (
--           'agg_curves.cpp',
--           'agg_bezier_arc.cpp',
--           'agg_trans_affine.cpp',
--           'agg_vcgen_stroke.cpp',
--           )
--
--    deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
--    deps.extend(glob.glob('CXX/*.cxx'))
-+    deps = glob.glob('CXX/*.cxx')
-     deps.extend(glob.glob('CXX/*.c'))
- 
-     temp_copy('src/_path.cpp', 'src/path.cpp')
-@@ -1317,14 +1299,8 @@ def build_image(ext_modules, packages):
-     global BUILT_IMAGE
-     if BUILT_IMAGE: return # only build it if you you haven't already
- 
--    agg = ('agg_trans_affine.cpp',
--           'agg_image_filters.cpp',
--           'agg_bezier_arc.cpp',
--           )
--
-     temp_copy('src/_image.cpp', 'src/image.cpp')
-     deps = ['src/image.cpp', 'src/mplutils.cpp']
--    deps.extend(['%s/src/%s'%(AGG_VERSION,name) for name in agg])
-     deps.extend(glob.glob('CXX/*.cxx'))
-     deps.extend(glob.glob('CXX/*.c'))
- 

matplotlib-1.0.1-tkinter.patch

@@ -1,12 +0,0 @@
-diff -up matplotlib-1.0.1/setupext.py.tkinter matplotlib-1.0.1/setupext.py
---- matplotlib-1.0.1/setupext.py.tkinter	2011-10-31 14:58:44.000000000 +0100
-+++ matplotlib-1.0.1/setupext.py	2011-10-31 14:59:14.000000000 +0100
-@@ -829,7 +829,7 @@ def check_for_tk():
- 
-     if gotit:
-         print_status("Tkinter", "Tkinter: %s, Tk: %s, Tcl: %s" %
--                     (Tkinter.__version__.split()[-2], Tkinter.TkVersion, Tkinter.TclVersion))
-+                     (Tkinter.__version__, Tkinter.TkVersion, Tkinter.TclVersion))
-     else:
-         print_status("Tkinter", "no")
-     if explanation is not None:

python-matplotlib.spec

@@ -19,7 +19,7 @@
 
 Name:           python-matplotlib
 Version:        1.0.1
-Release:        14%{?dist}
+Release:        12%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
@@ -36,21 +36,14 @@ Source1:        http://downloads.sourceforge.net/matplotlib/mpl_sampledata-%{ver
 Source2:        setup.cfg
 # This patch taken from upstream SVN and will not be needed for releases later than 1.0.1
 Patch0:         matplotlib-1.0.1-plot_directive.patch
-Patch1:         matplotlib-1.0.1-noagg.patch
-Patch2:		0001-Bugfix-propagate-timezone-info-in-plot_date-xaxis_da.patch
-# fix build when Tkinter doesn't return an expected value in __version__ (FTBFS)
-Patch3:         matplotlib-1.0.1-tkinter.patch
+patch1:		0001-Bugfix-propagate-timezone-info-in-plot_date-xaxis_da.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel, freetype-devel, libpng-devel, zlib-devel
 BuildRequires:  pygtk2-devel, gtk2-devel
 BuildRequires:  pytz, python-dateutil, numpy
-BuildRequires:  agg-devel
-BuildRequires:  pyparsing
 Requires:       numpy, pytz, python-dateutil
 Requires:       pycairo >= 1.2.0
 Requires:       dejavu-sans-fonts
-Requires:       dvipng
-Requires:       pyparsing
 
 %description
 Matplotlib is a pure python plotting library with the goal of making
@@ -104,16 +97,9 @@ BuildRequires:  python-basemap
 %else
 %setup -q -n matplotlib-%{version}
 %endif
+
 %patch0 -p1
-%patch2 -p1
-%patch3 -p1 -b .tkinter
-
-# Remove bundled libraries
-rm -r agg24 lib/matplotlib//pyparsing.py
-
-# Remove references to bundled libraries
-%patch1 -p1 -b .noagg
-sed -i -e s/matplotlib\.pyparsing/pyparsing/g lib/matplotlib/*.py
+%patch1 -p1
 
 chmod -x lib/matplotlib/mpl-data/images/*.svg
 
@@ -195,16 +181,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Mon Oct 31 2011 Dan Horák <dan[at]danny.cz> - 1.0.1-14
-- fix build with new Tkinter which doesn't return an expected value in __version__
-
-* Thu Sep 15 2011 Jef Spaleta <jspaleta@fedoraproject.org> - 1.0.1-13
-- apply upstream bugfix for timezone formatting (Bug 735677) 
-
-* Fri May 20 2011 Orion Poplawski <orion@cora.nwra.com> - 1.0.1-12
-- Add Requires dvipng (Bug 684836)
-- Build against system agg (Bug 612807)
-- Use system pyparsing (Bug 702160)
+* Thu Sep 15 2011 Jef Spaleta <jspaleta@fedoraproject.org> - 1.0.1-12
+- Apply upstream patch for timezone in plotting (bug 735677) 
 
 * Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-11
 - Set PYTHONPATH during html doc building using find to prevent broken builds