fix build with new Tkinter which doesn't return an expected value in __version__

Build against system agg (Bug 612807)
Use system pyparsing (Bug 702160)

0001-Bugfix-propagate-timezone-info-in-plot_date-xaxis_da.patch

@@ -0,0 +1,188 @@
+--- a/lib/matplotlib/axes.py
++++ b/lib/matplotlib/axes.py
+@@ -2679,18 +2679,20 @@ class Axes(martist.Artist):
+     def xaxis_date(self, tz=None):
+         """Sets up x-axis ticks and labels that treat the x data as dates.
+ 
+-        *tz* is the time zone to use in labeling dates.  Defaults to rc value.
++        *tz* is a timezone string or :class:`tzinfo` instance.
++        Defaults to rc value.
+         """
+         # should be enough to inform the unit conversion interface
+-        # dates are comng in
+-        self.xaxis.axis_date()
++        # dates are coming in
++        self.xaxis.axis_date(tz)
+ 
+     def yaxis_date(self, tz=None):
+         """Sets up y-axis ticks and labels that treat the y data as dates.
+ 
+-        *tz* is the time zone to use in labeling dates.  Defaults to rc value.
++        *tz* is a timezone string or :class:`tzinfo` instance.
++        Defaults to rc value.
+         """
+-        self.yaxis.axis_date()
++        self.yaxis.axis_date(tz)
+ 
+     def format_xdata(self, x):
+         """
+@@ -3808,7 +3810,7 @@ class Axes(martist.Artist):
+           *fmt*: string
+             The plot format string.
+ 
+-          *tz*: [ None | timezone string ]
++          *tz*: [ None | timezone string | :class:`tzinfo` instance]
+             The time zone to use in labeling dates. If *None*, defaults to rc
+             value.
+ 
+diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
+index 85e078c..a825d8e 100644
+--- a/lib/matplotlib/axis.py
++++ b/lib/matplotlib/axis.py
+@@ -1249,21 +1249,21 @@ class Axis(artist.Artist):
+     def update_units(self, data):
+         """
+         introspect *data* for units converter and update the
+-        axis.converter instance if necessary. Return *True* is *data* is
+-        registered for unit conversion
++        axis.converter instance if necessary. Return *True*
++        if *data* is registered for unit conversion.
+         """
+ 
+         converter = munits.registry.get_converter(data)
+-        if converter is None: return False
++        if converter is None:
++            return False
+ 
+         neednew = self.converter!=converter
+         self.converter = converter
+         default = self.converter.default_units(data, self)
+-        #print 'update units: default="%s", units=%s"'%(default, self.units)
++        #print 'update units: default=%s, units=%s'%(default, self.units)
+         if default is not None and self.units is None:
+             self.set_units(default)
+ 
+-
+         if neednew:
+             self._update_axisinfo()
+         return True
+@@ -1484,14 +1484,21 @@ class Axis(artist.Artist):
+         self.major.locator.zoom(direction)
+ 
+ 
+-    def axis_date(self):
++    def axis_date(self, tz=None):
+         """
+         Sets up x-axis ticks and labels that treat the x data as dates.
++        *tz* is a :class:`tzinfo` instance or a timezone string.
++        This timezone is used to create date labels.
+         """
++        # By providing a sample datetime instance with the desired
++        # timezone, the registered converter can be selected,
++        # and the "units" attribute, which is the timezone, can
++        # be set.
+         import datetime
+-        # should be enough to inform the unit conversion interface
+-        # dates are comng in
+-        self.update_units(datetime.date(2009,1,1))
++        if isinstance(tz, (str, unicode)):
++            import pytz
++            tz = pytz.timezone(tz)
++        self.update_units(datetime.datetime(2009,1,1,0,0,0,0,tz))
+ 
+ 
+ class XAxis(Axis):
+diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
+index 7a2f9f3..9018315 100644
+--- a/lib/matplotlib/dates.py
++++ b/lib/matplotlib/dates.py
+@@ -1104,15 +1104,26 @@ def weeks(w):
+ 
+ 
+ class DateConverter(units.ConversionInterface):
+-    """The units are equivalent to the timezone."""
++    """
++    Converter for datetime.date and datetime.datetime data,
++    or for date/time data represented as it would be converted
++    by :func:`date2num`.
++
++    The 'unit' tag for such data is None or a tzinfo instance.
++    """
+ 
+     @staticmethod
+     def axisinfo(unit, axis):
+-        'return the unit AxisInfo'
+-        # make sure that the axis does not start at 0
++        """
++        Return the :class:`~matplotlib.units.AxisInfo` for *unit*.
++
++        *unit* is a tzinfo instance or None.
++        The *axis* argument is required but not used.
++        """
++        tz = unit
+ 
+-        majloc = AutoDateLocator(tz=unit)
+-        majfmt = AutoDateFormatter(majloc, tz=unit)
++        majloc = AutoDateLocator(tz=tz)
++        majfmt = AutoDateFormatter(majloc, tz=tz)
+         datemin = datetime.date(2000, 1, 1)
+         datemax = datetime.date(2010, 1, 1)
+ 
+@@ -1121,12 +1132,28 @@ class DateConverter(units.ConversionInterface):
+ 
+     @staticmethod
+     def convert(value, unit, axis):
+-        if units.ConversionInterface.is_numlike(value): return value
++        """
++        If *value* is not already a number or sequence of numbers,
++        convert it with :func:`date2num`.
++
++        The *unit* and *axis* arguments are not used.
++        """
++        if units.ConversionInterface.is_numlike(value):
++            return value
+         return date2num(value)
+ 
+     @staticmethod
+     def default_units(x, axis):
+-        'Return the default unit for *x* or None'
++        'Return the tzinfo instance of *x* or of its first element, or None'
++        try:
++            x = x[0]
++        except (TypeError, IndexError):
++            pass
++
++        try:
++            return x.tzinfo
++        except AttributeError:
++            pass
+         return None
+ 
+ 
+diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
+index 700363a..59b570e 100644
+--- a/lib/matplotlib/units.py
++++ b/lib/matplotlib/units.py
+@@ -7,8 +7,8 @@ objects, eg a list of datetime objects, as well as for objects that
+ are unit aware.  We don't assume any particular units implementation,
+ rather a units implementation must provide a ConversionInterface, and
+ the register with the Registry converter dictionary.  For example,
+-here is a complete implementation which support plotting with native
+-datetime objects
++here is a complete implementation which supports plotting with native
++datetime objects::
+ 
+ 
+     import matplotlib.units as units
+@@ -48,7 +48,7 @@ from matplotlib.cbook import iterable, is_numlike, is_string_like
+ class AxisInfo:
+     'information to support default axis labeling and tick labeling, and default limits'
+     def __init__(self, majloc=None, minloc=None,
+-                 majfmt=None, minfmt=None, label=None, 
++                 majfmt=None, minfmt=None, label=None,
+                  default_limits=None):
+         """
+         majloc and minloc: TickLocators for the major and minor ticks
+-- 
+1.7.6.2
+

matplotlib-1.0.1-noagg.patch

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

@@ -0,0 +1,12 @@
+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:        11%{?dist}
+Release:        14%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
@@ -36,13 +36,21 @@ 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
 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
@@ -96,8 +104,17 @@ 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
+
 chmod -x lib/matplotlib/mpl-data/images/*.svg
 
 cp %{SOURCE2} ./setup.cfg
@@ -178,6 +195,17 @@ 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)
+
 * 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