- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

bugs closed: #1030396, #982793, #1049624

.gitignore

@@ -1,3 +1,6 @@
 matplotlib-1.0.0-without-gpc.tar.gz
 /matplotlib-1.0.1-without-gpc.tar.gz
 /mpl_sampledata-1.0.1.tar.gz
+/matplotlib-1.2.0-without-gpc.tar.gz
+/matplotlib-1.3.0-without-gpc.tar.xz
+/matplotlib-1.3.1-without-gpc.tar.xz

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

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

20_matplotlibrc_path_search_fix.patch

@@ -0,0 +1,29 @@
+Description: Fixes the path to search for matplotlibrc file
+Forwarded: not-needed
+Author: Sandro Tosi <morph@debian.org>
+
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -607,10 +607,12 @@ def _get_data_path():
+             raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
+         return path
+ 
+-    path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
++    path = '/usr/share/matplotlib/mpl-data'
+     if os.path.isdir(path):
+         return path
+ 
++    raise RuntimeError('Could not find the matplotlib data files')
++
+     # setuptools' namespace_packages may highjack this init file
+     # so need to try something known to be in matplotlib, not basemap
+     import matplotlib.afm
+@@ -727,7 +729,7 @@ def matplotlib_fname():
+                     _get_xdg_config_dir())
+             return fname
+ 
+-    path = get_data_path()  # guaranteed to exist or raise
++    path = '/etc'  # guaranteed to exist or raise
+     fname = os.path.join(path, 'matplotlibrc')
+     if not os.path.exists(fname):
+         warnings.warn('Could not find matplotlibrc; using defaults')

40_bts608939_draw_markers_description.patch

@@ -0,0 +1,14 @@
+Description: minor glitch in draw_markers() description
+Author: Jakub Wilk <jwilk@debian.org>
+
+--- a/doc/api/api_changes.rst
++++ b/doc/api/api_changes.rst
+@@ -919,7 +919,7 @@ New methods:
+ 
+   * :meth:`draw_markers(self, gc, marker_path, marker_trans, path,
+     trans, rgbFace)
+-    <matplotlib.backend_bases.RendererBase.draw_markers`
++    <matplotlib.backend_bases.RendererBase.draw_markers>`
+ 
+   * :meth:`draw_path_collection(self, master_transform, cliprect,
+     clippath, clippath_trans, paths, all_transforms, offsets,

50_bts608942_spaces_in_param_args.patch

@@ -0,0 +1,49 @@
+Description: don't separate param and its argument with a space
+
+--- a/lib/mpl_toolkits/axes_grid1/axes_divider.py
++++ b/lib/mpl_toolkits/axes_grid1/axes_divider.py
+@@ -201,12 +201,12 @@ class Divider(object):
+     def locate(self, nx, ny, nx1=None, ny1=None, axes=None, renderer=None):
+         """
+ 
+-        :param nx, nx1: Integers specifying the column-position of the
++        :param nx,nx1: Integers specifying the column-position of the
+           cell. When nx1 is None, a single nx-th column is
+           specified. Otherwise location of columns spanning between nx
+           to nx1 (but excluding nx1-th column) is specified.
+ 
+-        :param ny, ny1: same as nx and nx1, but for row positions.
++        :param ny,ny1: same as nx and nx1, but for row positions.
+         """
+ 
+ 
+@@ -253,12 +253,12 @@ class Divider(object):
+         (:class:`mpl_toolkits.axes_grid.axes_divider.AxesLocator`) for
+         specified cell.
+ 
+-        :param nx, nx1: Integers specifying the column-position of the
++        :param nx,nx1: Integers specifying the column-position of the
+           cell. When nx1 is None, a single nx-th column is
+           specified. Otherwise location of columns spanning between nx
+           to nx1 (but excluding nx1-th column) is specified.
+ 
+-        :param ny, ny1: same as nx and nx1, but for row positions.
++        :param ny,ny1: same as nx and nx1, but for row positions.
+         """
+         return AxesLocator(self, nx, ny, nx1, ny1)
+ 
+@@ -299,12 +299,12 @@ class AxesLocator(object):
+         """
+         :param axes_divider: An instance of AxesDivider class.
+ 
+-        :param nx, nx1: Integers specifying the column-position of the
++        :param nx,nx1: Integers specifying the column-position of the
+           cell. When nx1 is None, a single nx-th column is
+           specified. Otherwise location of columns spanning between nx
+           to nx1 (but excluding nx1-th column) is is specified.
+ 
+-        :param ny, ny1: same as nx and nx1, but for row positions.
++        :param ny,ny1: same as nx and nx1, but for row positions.
+         """
+         self._axes_divider = axes_divider
+ 

60_deal_with_no_writable_dirs.patch

@@ -0,0 +1,111 @@
+Description: deal with the case where there are no writable directories.
+Author: Michael Droettboom <mdboom@gmail.com>
+Bug-Debian: http://bugs.debian.org/719384
+Origin: https://github.com/mdboom/matplotlib/commit/1e8d592ed0439ac6fe8fc08d5efe522799acf4fe
+Reviewed-By: Anton Gladky <gladk@debian.org>
+Last-Update: 2013-09-29
+
+--- matplotlib-1.3.0.orig/lib/matplotlib/font_manager.py
++++ matplotlib-1.3.0/lib/matplotlib/font_manager.py
+@@ -1324,6 +1324,8 @@ if USE_FONTCONFIG and sys.platform != 'w
+         return result
+ 
+ else:
++    _fmcache = None
++
+     if not 'TRAVIS' in os.environ:
+         cachedir = get_cachedir()
+         if cachedir is not None:
+@@ -1331,8 +1333,6 @@ else:
+                 _fmcache = os.path.join(cachedir, 'fontList.py3k.cache')
+             else:
+                 _fmcache = os.path.join(cachedir, 'fontList.cache')
+-    else:
+-        _fmcache = None
+ 
+     fontManager = None
+ 
+--- matplotlib-1.3.0.orig/lib/matplotlib/__init__.py
++++ matplotlib-1.3.0/lib/matplotlib/__init__.py
+@@ -518,7 +518,11 @@ def _get_xdg_config_dir():
+     base directory spec
+     <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
+     """
+-    return os.environ.get('XDG_CONFIG_HOME', os.path.join(get_home(), '.config'))
++    home = get_home()
++    if home is None:
++        return None
++    else:
++        return os.environ.get('XDG_CONFIG_HOME', os.path.join(home, '.config'))
+ 
+ 
+ def _get_xdg_cache_dir():
+@@ -527,7 +531,11 @@ def _get_xdg_cache_dir():
+     base directory spec
+     <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
+     """
+-    return os.environ.get('XDG_CACHE_HOME', os.path.join(get_home(), '.cache'))
++    home = get_home()
++    if home is None:
++        return None
++    else:
++        return os.environ.get('XDG_CACHE_HOME', os.path.join(home, '.cache'))
+ 
+ 
+ def _get_config_or_cache_dir(xdg_base):
+@@ -543,22 +551,28 @@ def _get_config_or_cache_dir(xdg_base):
+             return _create_tmp_config_dir()
+         return configdir
+ 
++    p = None
+     h = get_home()
+-    p = os.path.join(h, '.matplotlib')
+-    if (sys.platform.startswith('linux') and
+-        not os.path.exists(p)):
+-        p = os.path.join(xdg_base, 'matplotlib')
+-
+-    if os.path.exists(p):
+-        if not _is_writable_dir(p):
+-            return _create_tmp_config_dir()
+-    else:
+-        try:
+-            mkdirs(p)
+-        except OSError:
+-            return _create_tmp_config_dir()
++    if h is not None:
++        p = os.path.join(h, '.matplotlib')
++        if (sys.platform.startswith('linux') and
++            not os.path.exists(p) and
++            xdg_base is not None):
++            p = os.path.join(xdg_base, 'matplotlib')
++
++    if p is not None:
++        if os.path.exists(p):
++            if _is_writable_dir(p):
++                return p
++        else:
++            try:
++                mkdirs(p)
++            except OSError:
++                pass
++            else:
++                return p
+ 
+-    return p
++    return _create_tmp_config_dir()
+ 
+ 
+ def _get_configdir():
+@@ -716,9 +730,11 @@ def matplotlib_fname():
+     if configdir is not None:
+         fname = os.path.join(configdir, 'matplotlibrc')
+         if os.path.exists(fname):
++            home = get_home()
+             if (sys.platform.startswith('linux') and
++                home is not None and
+                 fname == os.path.join(
+-                    get_home(), '.matplotlib', 'matplotlibrc')):
++                    home, '.matplotlib', 'matplotlibrc')):
+                 warnings.warn(
+                     "Found matplotlib configuration in ~/.matplotlib/. "
+                     "To conform with the XDG base directory standard, "

70_bts720549_try_StayPuft_for_xkcd.patch

@@ -0,0 +1,19 @@
+Description: Try to use also StayPuft (a free font) for xkcd
+Author: Sandro Tosi <morph@debian.org>
+Origin: vendor
+Bug: http://bugs.debian.org/720549
+Forwarded: not-needed
+Last-Update: 2013-10-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/matplotlib/pyplot.py
++++ b/lib/matplotlib/pyplot.py
+@@ -289,7 +289,7 @@ def xkcd(scale=1, length=100, randomness
+     from matplotlib import patheffects
+     context = rc_context()
+     try:
+-        rcParams['font.family'] = ['Humor Sans', 'Comic Sans MS']
++        rcParams['font.family'] = ['Humor Sans', 'Comic Sans MS', 'StayPuft']
+         rcParams['font.size'] = 14.0
+         rcParams['path.sketch'] = (scale, length, randomness)
+         rcParams['path.effects'] = [

generate-tarball.sh

@@ -6,7 +6,7 @@ version=$1
 
 dir=matplotlib-${version}
 file=matplotlib-${version}.tar.gz
-result=matplotlib-${version}-without-gpc.tar.gz
+result=matplotlib-${version}-without-gpc.tar.xz
 
 wget -vc http://downloads.sourceforge.net/matplotlib/$file
 
@@ -16,4 +16,4 @@ tar xzf $file
 rm matplotlib-${version}/agg24/include/agg_conv_gpc.h
 
 rm -f $result
-tar czf $result $dir
+tar cJf $result $dir

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-plot_directive.patch

@@ -1,12 +0,0 @@
-diff -uNr matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py
---- matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py	2011-01-23 05:42:08.000000000 +0900
-+++ matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py	2011-01-23 05:44:48.000000000 +0900
-@@ -346,7 +346,7 @@
-         del options['nofigs']
- 
-     formats = setup.config.plot_formats
--    if type(formats) == str:
-+    if type(formats) == str or type(formats) == unicode:
-         formats = eval(formats)
- 
-     fname = os.path.basename(plot_path)

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-noagg.patch

@@ -0,0 +1,26 @@
+--- setupext.py.orig	2013-08-02 09:39:43.914247832 +0200
++++ setupext.py	2013-08-02 09:40:14.785304342 +0200
+@@ -749,22 +749,7 @@
+             return str(e) + ' Using local copy.'
+ 
+     def add_flags(self, ext):
+-        if self.found_external:
+-            pkg_config.setup_extension(ext, 'libagg')
+-        else:
+-            ext.include_dirs.append('agg24/include')
+-            agg_sources = [
+-                'agg_bezier_arc.cpp',
+-                'agg_curves.cpp',
+-                'agg_image_filters.cpp',
+-                'agg_trans_affine.cpp',
+-                'agg_vcgen_contour.cpp',
+-                'agg_vcgen_dash.cpp',
+-                'agg_vcgen_stroke.cpp',
+-                'agg_vpgen_segmentator.cpp'
+-                ]
+-            ext.sources.extend(
+-                os.path.join('agg24', 'src', x) for x in agg_sources)
++        pkg_config.setup_extension(ext, 'libagg', default_include_dirs=["/usr/include/agg2"])
+ 
+ 
+ class FreeType(SetupPackage):

python-matplotlib-system-cxx.patch

@@ -0,0 +1,15 @@
+--- setupext.py.orig	2014-01-25 15:06:39.460916454 +0100
++++ setupext.py	2014-01-25 15:06:53.080946205 +0100
+@@ -768,12 +768,6 @@
+     name = 'pycxx'
+ 
+     def check(self):
+-        if sys.version_info[0] >= 3:
+-            # There is no version of PyCXX in the wild that will work
+-            # with Python 3.x
+-            self.__class__.found_external = False
+-            return ("Official versions of PyCXX are not compatible with "
+-                    "Python 3.x.  Using local copy")
+ 
+         self.__class__.found_external = True
+         old_stdout = sys.stdout

python-matplotlib.spec

@@ -1,208 +1,567 @@
-%if ! (0%{?rhel} > 5)
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if 0%{?fedora} >= 18
+%global with_python3            1
+%global basepy3dir              %(echo ../`basename %{py3dir}`)
+%else
+%global with_python3            0
+%endif
+%global __provides_exclude_from	.*/site-packages/.*\\.so$
+%global with_html               1
+%global run_tests               0
+
+# On RHEL 7 onwards, don't build with wx:
+%if 0%{?rhel} >= 7
+%global with_wx 0
+%else
+%global with_wx 1
 %endif
 
-%{?filter_setup:
-%filter_provides_in %{python_sitearch}/.*\.so$
-%filter_setup
-}
+# the default backend; one of GTK GTKAgg GTKCairo GTK3Agg GTK3Cairo
+# CocoaAgg MacOSX Qt4Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG
+%global backend                 TkAgg
 
-# We include capability for building a doc subpackage for
-# documentation. However, building the html documentation requires
-# python-basemap, and python-basemap requires python-matplotlib to build, so
-# we have a circular dependence, and so we need to be able to turn off
-# building of the html documents. Note that when building the html docs,
-# python-basemap will pull in the existing python-matplotlib from the
-# repos. So, it's important to set PYTHONPATH to use the newly built modules
-# from this package. 
-%global withhtmldocs 1
+# https://fedorahosted.org/fpc/ticket/381
+%global with_bundled_fonts      1
 
 Name:           python-matplotlib
-Version:        1.0.1
-Release:        19%{?dist}
-Summary:        Python plotting library
-
+Version:        1.3.1
+Release:        7%{?dist}
+Summary:        Python 2D plotting library
 Group:          Development/Libraries
-License:        Python
-URL:            http://sourceforge.net/projects/matplotlib
+# qt4_editor backend is MIT
+License:        Python and MIT
+URL:            http://matplotlib.org
 #Modified Sources to remove the one undistributable file
 #See generate-tarball.sh in fedora cvs repository for logic
-#sha1sum matplotlib-1.0.1-without-gpc.tar.gz
-#a8ccbf4c4b9b90c773380cac83e792673837d3de  matplotlib-1.0.1-without-gpc.tar.gz
-Source0:        matplotlib-%{version}-without-gpc.tar.gz
-%if %{withhtmldocs}
-Source1:        http://downloads.sourceforge.net/matplotlib/mpl_sampledata-%{version}.tar.gz
-%endif
-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
+#sha1sum matplotlib-1.2.0-without-gpc.tar.gz
+#92ada4ef4e7374d67e46e30bfb08c3fed068d680  matplotlib-1.2.0-without-gpc.tar.gz
+Source0:        matplotlib-%{version}-without-gpc.tar.xz
+Source1:        setup.cfg
 
-# Fix building against libpng 1.5
-#   https://github.com/matplotlib/matplotlib/issues/234
-# Based on:
-#   https://github.com/matplotlib/matplotlib/commit/45c46672648e3b4a277bf7ff42b3baf56a98bcec
-Patch4:         use-png-accessor-functions.patch
+Patch0:         %{name}-noagg.patch
+Patch1:         %{name}-system-cxx.patch
+Patch2:         20_matplotlibrc_path_search_fix.patch
+Patch3:         40_bts608939_draw_markers_description.patch
+Patch4:         50_bts608942_spaces_in_param_args.patch
+Patch5:         60_deal_with_no_writable_dirs.patch
+Patch6:         70_bts720549_try_StayPuft_for_xkcd.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:  freetype-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  libpng-devel
+BuildRequires:  numpy
+BuildRequires:  pycairo-devel
+BuildRequires:  pygtk2-devel
 BuildRequires:  pyparsing
-Requires:       numpy, pytz, python-dateutil
-Requires:       pycairo >= 1.2.0
+BuildRequires:  python-pycxx-devel
+BuildRequires:  python-dateutil
+BuildRequires:  python-setuptools
+%if %{with_html}
+BuildRequires:  python-numpydoc
+%endif
+%if %{run_tests}
+BuildRequires:  python-nose
+%if %{with_python3}
+BuildRequires:  python3-nose
+%endif
+%endif
+BuildRequires:  python2-devel
+BuildRequires:  pytz
+BuildRequires:  xorg-x11-server-Xvfb
+BuildRequires:  zlib-devel
 Requires:       dejavu-sans-fonts
 Requires:       dvipng
+Requires:       numpy
+Requires:       pycairo
+Requires:       pygtk2
 Requires:       pyparsing
+Requires:       python-dateutil
+Requires:       pytz
+%if 0%{?fedora} >= 18
+Requires:	stix-math-fonts
+%else
+Requires:	stix-fonts
+%endif
+Requires:       %{name}-data = %{version}-%{release}
+
+# GTKAgg does not require extra subpackages, but does not work with python3
+%if "%{backend}" == "TkAgg"
+Requires:       %{name}-tk%{?_isa} = %{version}-%{release}
+%else
+%  if "%{backend}" == "Qt4Agg"
+Requires:       %{name}-qt4%{?_isa} = %{version}-%{release}
+%  endif
+%endif
 
 %description
-Matplotlib is a pure python plotting library with the goal of making
-publication quality plots using a syntax familiar to Matlab users. The
-library uses numpy for handling large data sets and supports a variety
-of output back-ends.
+Matplotlib is a python 2D plotting library which produces publication
+quality figures in a variety of hardcopy formats and interactive
+environments across platforms. matplotlib can be used in python
+scripts, the python and ipython shell, web application servers, and
+six graphical user interface toolkits.
 
+Matplotlib tries to make easy things easy and hard things possible.
+You can generate plots, histograms, power spectra, bar charts,
+errorcharts, scatterplots, etc, with just a few lines of code.
+
+%package        qt4
+Summary:        Qt4 backend for python-matplotlib
+Group:          Development/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+BuildRequires:  PyQt4-devel
+Requires:       PyQt4
+
+%description    qt4
+%{summary}
 
 %package        tk
 Summary:        Tk backend for python-matplotlib
 Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-BuildRequires:  tkinter, tk-devel
+BuildRequires:  tcl-devel
+BuildRequires:  tkinter
+BuildRequires:  tk-devel
 Requires:       tkinter
 
 %description    tk
 %{summary}
 
+%if %{with_wx}
 %package        wx
 Summary:        wxPython backend for python-matplotlib
 Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       wxPython
 BuildRequires:  wxPython-devel
+Requires:       wxPython
 
 %description    wx
 %{summary}
+%endif # with_wx
 
 %package        doc
 Summary:        Documentation files for python-matplotlib
 Group:          Documentation
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-%if %{withhtmldocs}
+%if %{with_html}
 BuildRequires:  python-sphinx
 BuildRequires:  tex(latex)
 BuildRequires:  dvipng
-BuildRequires:  PyQt4
-BuildRequires:  python-basemap
-# Some of the docs don't build as python-xlwt is needed. However the review
-# request isn't yet complete for this package. See:
-# https://bugzilla.redhat.com/show_bug.cgi?id=613766 
-# BuildRequires: python-xlwt
 %endif
 
 %description    doc
 %{summary}
 
-%prep
-%if %{withhtmldocs}
-%setup -q -n matplotlib-%{version} -b1
-%else
-%setup -q -n matplotlib-%{version}
+%package        data
+Summary:        Data used by python-matplotlib
+%if %{with_bundled_fonts}
+Requires:       %{name}-data-fonts = %{version}-%{release}
+%endif
+BuildArch:      noarch
+
+%description    data
+%{summary}
+
+%if %{with_bundled_fonts}
+%package        data-fonts
+Summary:        Fonts used by python-matplotlib
+Requires:       %{name}-data = %{version}-%{release}
+BuildArch:      noarch
+
+%description    data-fonts
+%{summary}
+%endif
+
+%if %{with_python3}
+%package -n     python3-matplotlib
+Summary:        Python 2D plotting library
+Group:          Development/Libraries
+BuildRequires:  python3-cairo
+BuildRequires:  python3-dateutil
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-gobject
+BuildRequires:  python3-numpy
+BuildRequires:  python3-pycxx-devel
+BuildRequires:  python3-pyparsing
+BuildRequires:  python3-pytz
+BuildRequires:  python3-six
+Requires:       python3-numpy
+Requires:       python3-cairo
+Requires:       python3-pyparsing
+Requires:       python3-dateutil
+Requires:       python3-pytz
+%if 0%{?fedora} >= 18
+Requires:	stix-math-fonts
+%else
+Requires:	stix-fonts
+%endif
+Requires:       %{name}-data = %{version}-%{release}
+%if "%{backend}" == "TkAgg"
+Requires:       python3-matplotlib-tk%{?_isa} = %{version}-%{release}
+%else
+%  if "%{backend}" == "Qt4Agg"
+Requires:       python3-matplotlib-qt4%{?_isa} = %{version}-%{release}
+%  endif
+%endif
+
+%description -n python3-matplotlib
+Matplotlib is a python 2D plotting library which produces publication
+quality figures in a variety of hardcopy formats and interactive
+environments across platforms. matplotlib can be used in python
+scripts, the python and ipython shell, web application servers, and
+six graphical user interface toolkits.
+
+Matplotlib tries to make easy things easy and hard things possible.
+You can generate plots, histograms, power spectra, bar charts,
+errorcharts, scatterplots, etc, with just a few lines of code.
+
+%package -n     python3-matplotlib-qt4
+Summary:        Qt4 backend for python3-matplotlib
+Group:          Development/Libraries
+Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
+BuildRequires:  python3-PyQt4-devel
+Requires:       python3-PyQt4
+
+%description -n python3-matplotlib-qt4
+%{summary}
+
+%package -n     python3-matplotlib-tk
+Summary:        Tk backend for python3-matplotlib
+Group:          Development/Libraries
+Requires:       python3-matplotlib%{?_isa} = %{version}-%{release}
+BuildRequires:  python3-tkinter
+Requires:       python3-tkinter
+
+%description -n python3-matplotlib-tk
+%{summary}
+%endif
+
+%prep
+%setup -q -n matplotlib-%{version}
+
+# Copy setup.cfg to the builddir
+cp %{SOURCE1} .
+sed -i 's/\(backend = \).*/\1%{backend}/' setup.cfg
+
+# Keep this until next version, and increment if changing from
+# USE_FONTCONFIG to False or True so that cache is regenerated
+# if updated from a version enabling fontconfig to one not
+# enabling it, or vice versa
+if [ %{version} = 1.3.1 ]; then
+    sed -i 's/\(__version__ = 101\)/\1.1/' lib/matplotlib/font_manager.py
+fi
+
+%if !%{with_bundled_fonts}
+# Use fontconfig by default
+sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py
 %endif
-%patch0 -p1
-%patch2 -p1
-%patch3 -p1 -b .tkinter
-%patch4 -p1
 
 # Remove bundled libraries
-rm -r agg24 lib/matplotlib//pyparsing.py
+rm -r agg24 CXX
 
 # Remove references to bundled libraries
-%patch1 -p1 -b .noagg
-sed -i -e s/matplotlib\.pyparsing/pyparsing/g lib/matplotlib/*.py
+%patch0 -b .noagg
+%patch1 -b .cxx
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 chmod -x lib/matplotlib/mpl-data/images/*.svg
 
-cp %{SOURCE2} ./setup.cfg
-
-%if %{withhtmldocs}
-pushd doc
-echo "examples.download : False" >> matplotlibrc
-echo "examples.directory : %{_builddir}/mpl_sampledata-%{version}" >> matplotlibrc
-popd
+%if %{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
 %endif
 
 %build
-%{__python} setup.py build
-
-%if %{withhtmldocs}
+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
+  xvfb-run %{__python2} setup.py build
+%if %{with_html}
+# Need to make built matplotlib libs available for the sphinx extensions:
 pushd doc
-# Set PYTHONPATH in order to use the just built modules
-export PYTHONPATH=`find %{_builddir} -name lib.linux*`
-# This really does need to be ran twice
-%{__python} make.py --small html && %{__python} make.py --small html
-rm -f build/html/.buildinfo
-chmod -x build/html/pyplots/make.py
-sed -i 's/\r//' build/html/_sources/devel/add_new_projection.txt
-sed -i 's/\r//' build/html/examples/api/font_family_rc.py
+    MPLCONFIGDIR=$PWD/.. \
+    MATPLOTLIBDATA=$PWD/../lib/matplotlib/mpl-data \
+    PYTHONPATH=`realpath ../build/lib.linux*` \
+        %{__python2} make.py html
+popd
+%endif
+# Ensure all example files are non-executable so that the -doc
+# package doesn't drag in dependencies
+find examples -name '*.py' -exec chmod a-x '{}' \;
+
+%if %{with_python3}
+pushd %{py3dir}
+    MPLCONFIGDIR=$PWD \
+    MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \
+      xvfb-run %{__python3} setup.py build
+    # documentation cannot be built with python3 due to syntax errors
+    # and building with python 2 exits with cryptic error messages
 popd
 %endif
 
-# Ensure all example files are non-executable so that the -doc package doesn't
-# drag in dependencies
-find examples -name '*.py' -exec chmod a-x '{}' \;
-
-# Fix line ending in this example file
-sed -i 's/\r//' examples/api/font_family_rc.py
-
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \
+  %{__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
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{_datadir}/matplotlib
+mv $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/mpl-data/matplotlibrc \
+   $RPM_BUILD_ROOT%{_sysconfdir}
+mv $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/mpl-data \
+   $RPM_BUILD_ROOT%{_datadir}/matplotlib
+%if !%{with_bundled_fonts}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/matplotlib/mpl-data/fonts
+%endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%if %{with_python3}
+pushd %{py3dir}
+    MPLCONFIGDIR=$PWD/.. \
+    MATPLOTLIBDATA=$PWD/../lib/matplotlib/mpl-data/ \
+        %{__python3} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+    chmod +x $RPM_BUILD_ROOT%{python3_sitearch}/matplotlib/dates.py
+    rm -fr $RPM_BUILD_ROOT%{python3_sitearch}/matplotlib/mpl-data
+    rm -f $RPM_BUILD_ROOT%{python3_sitearch}/six.py
+popd
+%endif
+
+%if %{run_tests}
+%check
+# This should match the default backend
+echo "backend      : %{backend}" > matplotlibrc
+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=$RPM_BUILD_ROOT%{_datadir}/matplotlib/mpl-data \
+PYTHONPATH=$RPM_BUILD_ROOT%{python_sitearch} \
+     xvfb-run %{__python} -c "import matplotlib; matplotlib.test()"
+
+%if %{with_python3}
+MPLCONFIGDIR=$PWD \
+MATPLOTLIBDATA=$RPM_BUILD_ROOT%{_datadir}/matplotlib/mpl-data \
+PYTHONPATH=$RPM_BUILD_ROOT%{python3_sitearch} \
+     xvfb-run %{__python3} -c "import matplotlib; matplotlib.test()"
+%endif
+%endif # run_tests
 
 %files
-%defattr(-,root,root,-)
-%doc README.txt license/LICENSE license/LICENSE_enthought.txt
-%doc license/LICENSE_PAINT license/LICENSE_PIL
-%doc CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
-%doc PKG-INFO TODO
-%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
+%doc README.rst
+%doc LICENSE/
+%doc CHANGELOG
+%doc INSTALL
+%doc PKG-INFO
+%doc TODO
 %{python_sitearch}/*egg-info
-%endif
+%{python_sitearch}/matplotlib-*-nspkg.pth
 %{python_sitearch}/matplotlib/
 %{python_sitearch}/mpl_toolkits/
 %{python_sitearch}/pylab.py*
+%exclude %{python_sitearch}/matplotlib/backends/backend_qt4.*
+%exclude %{python_sitearch}/matplotlib/backends/backend_qt4agg.*
 %exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
 %exclude %{python_sitearch}/matplotlib/backends/tkagg.*
 %exclude %{python_sitearch}/matplotlib/backends/_tkagg.so
 %exclude %{python_sitearch}/matplotlib/backends/backend_wx.*
 %exclude %{python_sitearch}/matplotlib/backends/backend_wxagg.*
 
+%files qt4
+%{python_sitearch}/matplotlib/backends/backend_qt4.*
+%{python_sitearch}/matplotlib/backends/backend_qt4agg.*
+
 %files tk
-%defattr(-,root,root,-)
 %{python_sitearch}/matplotlib/backends/backend_tkagg.py*
 %{python_sitearch}/matplotlib/backends/tkagg.py*
 %{python_sitearch}/matplotlib/backends/_tkagg.so
 
+%if %{with_wx}
 %files wx
-%defattr(-,root,root,-)
-%{python_sitearch}/matplotlib/backends/backend_wx.py*
-%{python_sitearch}/matplotlib/backends/backend_wxagg.py*
+%{python_sitearch}/matplotlib/backends/backend_wx.*
+%{python_sitearch}/matplotlib/backends/backend_wxagg.*
+%endif # with_wx
 
 %files doc
-%defattr(-,root,root,-)
 %doc examples
-%if %{withhtmldocs}
-%doc doc/build/html
+%if %{with_html}
+%doc doc/build/html/*
+%endif
+
+%files data
+%{_sysconfdir}/matplotlibrc
+%{_datadir}/matplotlib/mpl-data/
+%if %{with_bundled_fonts}
+%exclude %{_datadir}/matplotlib/mpl-data/fonts/
+%endif
+
+%if %{with_bundled_fonts}
+%files data-fonts
+%{_datadir}/matplotlib/mpl-data/fonts/
+%endif
+
+%if %{with_python3}
+%files -n python3-matplotlib
+%doc %{basepy3dir}/README.rst
+%doc %{basepy3dir}/LICENSE/
+%doc %{basepy3dir}/CHANGELOG
+%doc %{basepy3dir}/INSTALL
+%doc %{basepy3dir}/PKG-INFO
+%doc %{basepy3dir}/TODO
+%{python3_sitearch}/*egg-info
+%{python3_sitearch}/matplotlib-*-nspkg.pth
+%{python3_sitearch}/matplotlib/
+%{python3_sitearch}/mpl_toolkits/
+%{python3_sitearch}/pylab.py*
+%{python3_sitearch}/__pycache__/*
+%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*
+%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4agg.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*
+%exclude %{python3_sitearch}/matplotlib/backends/backend_tkagg.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*
+%exclude %{python3_sitearch}/matplotlib/backends/tkagg.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
+%exclude %{python3_sitearch}/matplotlib/backends/_tkagg.*
+%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/_tkagg.*
+
+%files -n python3-matplotlib-qt4
+%{python3_sitearch}/matplotlib/backends/backend_qt4.*
+%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*
+%{python3_sitearch}/matplotlib/backends/backend_qt4agg.*
+%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*
+
+%files -n python3-matplotlib-tk
+%{python3_sitearch}/matplotlib/backends/backend_tkagg.py*
+%{python3_sitearch}/matplotlib/backends/__pycache__/backend_tkagg.*
+%{python3_sitearch}/matplotlib/backends/tkagg.*
+%{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*
+%{python3_sitearch}/matplotlib/backends/_tkagg.*
 %endif
 
 %changelog
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed May 21 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 1.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
+
+* Wed May 14 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.3.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+
+* Tue Feb 11 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.3.1-3
+- Make TkAgg the default backend
+- Remove python2 dependency from -data subpackage
+
+* Mon Jan 27 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.3.1-2
+- Correct environment for and enable %%check
+- Install system wide matplotlibrc under /etc
+- Do not duplicate mpl-data for python2 and python3 packages
+- Conditionally bundle data fonts (https://fedorahosted.org/fpc/ticket/381)
+
+* Sat Jan 25 2014 Thomas Spura <tomspur@fedoraproject.org> - 1.3.1-1
+- update to 1.3.1
+- use GTKAgg as backend (#1030396, #982793, #1049624)
+- use fontconfig
+- add %%check for local testing (testing requires a display)
+
+* Wed Aug  7 2013 Thomas Spura <tomspur@fedoraproject.org> - 1.3.0-1
+- update to new version
+- use xz to compress sources
+- drop fontconfig patch (upstream)
+- drop tk patch (upstream solved build issue differently)
+- redo use system agg patch
+- delete bundled python-pycxx headers
+- fix requires of python3-matplotlib-qt (fixes #988412)
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Jun 10 2013 Jon Ciesla <limburgher@gmail.com> - 1.2.0-14
+- agg rebuild.
+
+* Wed Apr 10 2013 Thomas Spura <tomspur@fedoraproject.org> - 1.2.0-13
+- use python3 version in python3-matplotlib-qt4 (#915727)
+- include __pycache__ files in correct subpackages on python3
+
+* Wed Apr  3 2013 Thomas Spura <tomspur@fedoraproject.org> - 1.2.0-12
+- Decode output of subprocess to utf-8 or regex will fail (#928326)
+
+* Tue Apr  2 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-11
+- Make stix-fonts a requires of matplotlib (#928326)
+
+* Thu Mar 28 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-10
+- Use stix fonts avoid problems with missing cm fonts (#908717)
+- Correct type mismatch in python3 font_manager (#912843, #928326)
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jan 16 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-8
+- Update fontconfig patch to apply issue found by upstream
+- Update fontconfig patch to apply issue with missing afm fonts (#896182)
+
+* Wed Jan 16 2013 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-7
+- Use fontconfig by default (#885307)
+
+* Thu Jan  3 2013 David Malcolm <dmalcolm@redhat.com> - 1.2.0-6
+- remove wx support for rhel >= 7
+
+* Tue Dec 04 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-5
+- Reinstantiate wx backend for python2.x.
+- Run setup.py under xvfb-run to detect and default to gtk backend (#883502)
+- Split qt4 backend subpackage and add proper requires for it.
+- Correct wrong regex in tcl libdir patch.
+
+* Tue Nov 27 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-4
+- Obsolete python-matplotlib-wx for clean updates.
+
+* Tue Nov 27 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-3
+- Enable python 3 in fc18 as build requires are now available (#879731)
+
+* Thu Nov 22 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-2
+- Build python3 only on f19 or newer (#837156)
+- Build requires python3-six if building python3 support (#837156)
+
+* Thu Nov 22 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.2.0-1
+- Update to version 1.2.0
+- Revert to regenerate tarball with generate-tarball.sh (#837156)
+- Assume update to 1.2.0 is for recent releases
+- Remove %%defattr
+- Remove %%clean
+- Use simpler approach to build html documentation
+- Do not use custom/outdated setup.cfg
+- Put one BuildRequires per line
+- Enable python3 support
+- Cleanup spec as wx backend is no longer supported
+- Use default agg backend
+- Fix bogus dates in changelog by assuming only week day was wrong
+
+* Fri Aug 17 2012 Jerry James <loganjerry@gmail.com> - 1.1.1-1
+- Update to version 1.1.1.
+- Remove obsolete spec file elements
+- Fix sourceforge URLs
+- Allow sample data to have a different version number than the sources
+- Don't bother removing problematic file since we remove entire agg24 directory
+- Fix building with pygtk in the absence of an X server
+- Don't install license text for bundled software that we don't bundle
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jul 3 2012 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 1.1.0-1
+- Update to version 1.1.0.
+- Do not regenerate upstream tarball but remove problematic file in %%prep.
+- Remove non longer applicable/required patch0.
+- Rediff/rename -noagg patch.
+- Remove propagate-timezone-info-in-plot_date-xaxis_da patch already applied.
+- Remove tkinter patch now with critical code in a try block.
+- Remove png 1.5 patch as upstream is now png 1.5 aware.
+- Update file list.
+
+* Wed Apr 18 2012 David Malcolm <dmalcolm@redhat.com> - 1.0.1-20
+- remove wx support for rhel >= 7
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-19
 - Rebuilt for c++ ABI breakage
 
@@ -320,7 +679,7 @@ rm -rf $RPM_BUILD_ROOT
 * 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
+* Tue 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
@@ -359,7 +718,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Feb 09 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
+* Fri Jan  5 2007 Orion Poplawski <orion@cora.nwra.com> 0.87.7-4
 - Add examples to %%docs
 
 * Mon Dec 11 2006 Jef Spaleta <jspaleta@gmail.com> 0.87.7-3

setup.cfg

@@ -1,81 +1,2 @@
-# Rename this file to setup.cfg to modify matplotlib's
-# build options.
-
-[egg_info]
-tag_svn_revision = 1
-
-[status]
-# To suppress display of the dependencies and their versions
-# at the top of the build log, uncomment the following line:
-#suppress = True
-#
-# Uncomment to insert lots of diagnostic prints in extension code
-#verbose = True
-
-[provide_packages]
-# By default, matplotlib checks for a few dependencies and
-# installs them if missing. This feature can be turned off
-# by uncommenting the following lines. Acceptible values are:
-#     True: install, overwrite an existing installation
-#     False: do not install
-#     auto: install only if the package is unavailable. This
-#           is the default behavior
-#
-## Date/timezone support:
-#pytz = False
-#dateutil = False
-#
-## Experimental config package support:
-enthought.traits = False
-configobj = False
-
-[gui_support]
-# Matplotlib supports multiple GUI toolkits, including Cocoa,
-# GTK, Fltk, Qt, Qt4, Tk, and WX. Support for many of these
-# toolkits requires AGG, the Anti-Grain Geometry library, which
-# is provided by matplotlib and built by default.
-#
-# Some backends are written in pure Python, and others require
-# extension code to be compiled. By default, matplotlib checks
-# for these GUI toolkits during installation and, if present,
-# compiles the required extensions to support the toolkit. GTK
-# support requires the GTK runtime environment and PyGTK. Wx
-# support requires wxWidgets and wxPython. Tk support requires
-# Tk and Tkinter. The other GUI toolkits do not require any
-# extension code, and can be used as long as the libraries are
-# installed on your system.
-#
-# You can uncomment any the following lines if you know you do
-# not want to use the GUI toolkit. Acceptible values are:
-#     True: build the extension. Exits with a warning if the
-#           required dependencies are not available
-#     False: do not build the extension
-#     auto: build if the required dependencies are available,
-#           otherwise skip silently. This is the default
-#           behavior
-#
-gtk = True
-gtkagg = True
-tkagg = True
-wxagg = True
-
 [rc_options]
-# User-configurable options
-#
-# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg,
-# GTKCairo, FltkAgg, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
-#
-# The Agg, Ps, Pdf and SVG backends do not require external
-# dependencies. Do not choose GTK, GTKAgg, GTKCairo, TkAgg or WXAgg if
-# you have disabled the relevent extension modules.  Agg will be used
-# by default.
-#
 backend = GTKAgg
-#
-# The numerix module was historically used to provide
-# compatibility between the Numeric, numarray, and NumPy array
-# packages. Now that NumPy has emerge as the universal array
-# package for python, numerix is not really necessary and is
-# maintained to provide backward compatibility. Do not change
-# this unless you have a compelling reason to do so.
-numerix = numpy

sources

@@ -1,2 +1 @@
-b4d61df73ffa715f5009063a4ba78745  matplotlib-1.0.1-without-gpc.tar.gz
-24ee8b490f707a60ed5aaf7259f6bc40  mpl_sampledata-1.0.1.tar.gz
+832170ea532d5f7ca227ea04f044291e  matplotlib-1.3.1-without-gpc.tar.xz

use-png-accessor-functions.patch

@@ -1,79 +0,0 @@
-diff -up matplotlib-1.0.1/CHANGELOG.png15 matplotlib-1.0.1/CHANGELOG
-diff -up matplotlib-1.0.1/doc/users/installing.rst.png15 matplotlib-1.0.1/doc/users/installing.rst
---- matplotlib-1.0.1/doc/users/installing.rst.png15	2010-07-06 21:41:46.000000000 -0400
-+++ matplotlib-1.0.1/doc/users/installing.rst	2011-12-06 16:29:05.824621532 -0500
-@@ -138,7 +138,7 @@ libraries themselves.
-     array support for python (`download
-     <http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`__)
- 
--libpng 1.1 (or later)
-+libpng 1.2 (or later)
-     library for loading and saving :term:`PNG` files (`download
-     <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
-     zlib. If you are a windows user, you can ignore this since we
-diff -up matplotlib-1.0.1/src/_png.cpp.png15 matplotlib-1.0.1/src/_png.cpp
---- matplotlib-1.0.1/src/_png.cpp.png15	2010-10-12 12:14:42.000000000 -0400
-+++ matplotlib-1.0.1/src/_png.cpp	2011-12-06 16:29:05.825621532 -0500
-@@ -350,10 +350,10 @@ _png_module::read_png(const Py::Tuple& a
-     png_set_sig_bytes(png_ptr, 8);
-     png_read_info(png_ptr, info_ptr);
- 
--    png_uint_32 width = info_ptr->width;
--    png_uint_32 height = info_ptr->height;
-+    png_uint_32 width = png_get_image_width(png_ptr, info_ptr);
-+    png_uint_32 height = png_get_image_height(png_ptr, info_ptr);
- 
--    int bit_depth = info_ptr->bit_depth;
-+    int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
- 
-     // Unpack 1, 2, and 4-bit images
-     if (bit_depth < 8)
-@@ -361,7 +361,7 @@ _png_module::read_png(const Py::Tuple& a
- 
-     // If sig bits are set, shift data
-     png_color_8p sig_bit;
--    if ((info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) &&
-+    if ((png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE) &&
-         png_get_sBIT(png_ptr, info_ptr, &sig_bit))
-     {
-         png_set_shift(png_ptr, sig_bit);
-@@ -374,13 +374,13 @@ _png_module::read_png(const Py::Tuple& a
-     }
- 
-     // Convert palletes to full RGB
--    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
-     {
-         png_set_palette_to_rgb(png_ptr);
-     }
- 
-     // If there's an alpha channel convert gray to RGB
--    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
-     {
-         png_set_gray_to_rgb(png_ptr);
-     }
-@@ -408,11 +408,11 @@ _png_module::read_png(const Py::Tuple& a
-     npy_intp dimensions[3];
-     dimensions[0] = height;  //numrows
-     dimensions[1] = width;   //numcols
--    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-+    if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
-     {
-         dimensions[2] = 4;     //RGBA images
-     }
--    else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
-+    else if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR)
-     {
-         dimensions[2] = 3;     //RGB images
-     }
-@@ -421,7 +421,8 @@ _png_module::read_png(const Py::Tuple& a
-         dimensions[2] = 1;     //Greyscale images
-     }
-     //For gray, return an x by y array, not an x by y by 1
--    int num_dims  = (info_ptr->color_type & PNG_COLOR_MASK_COLOR) ? 3 : 2;
-+    int num_dims  = (png_get_color_type(png_ptr, info_ptr)
-+                                & PNG_COLOR_MASK_COLOR) ? 3 : 2;
- 
-     double max_value = (1 << ((bit_depth < 8) ? 8 : bit_depth)) - 1;
-     PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNew(