Compare commits

...

108 Commits
el4 ... f22

Author SHA1 Message Date
Thomas Spura
53aef6c52e Remove spurious Provides: bundled(agg) 2016-04-04 13:28:22 +02:00
Thomas Spura
8e6fb6a047 Require the qt5 subpackage from the qt4 subpackage (#1219556) 2016-04-04 12:40:34 +02:00
Thomas Spura
95c4d0eaf5 Use bundled version of agg
This was discussed in bug #1276806 and the agg package (which is incompatible
to matplotlib's version anyway) will be retired.
2016-04-04 12:33:40 +02:00
Thomas Spura
cfae272b51 Use github sources in generate-tarball 2016-04-04 12:29:44 +02:00
Fedora Release Engineering
c901c6602b - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 20:08:25 +00:00
Thomas Spura
96f1b73a85 Fix another requires of the main package 2016-01-13 10:37:45 +01:00
Thomas Spura
e065ba8c72 Bump release 2016-01-07 19:16:00 +01:00
Thomas Spura
108153e46c Fix requiring the correct backend from the main package 2016-01-07 19:14:44 +01:00
Thomas Spura
69fbdf849b regenerate tarball to exclude lena image (#1295174) 2016-01-07 10:50:10 +01:00
Thomas Spura
a0ff1b7b0d Add python2 subpackages and use python_provide 2015-11-15 14:45:49 +01:00
Thomas Spura
a9a2c96250 Replace tabs with spaces 2015-11-15 14:16:29 +01:00
Thomas Spura
5ddd160fd3 Pick upstream patch for fixing the gdk backend #1231748 2015-11-15 14:15:25 +01:00
Peter Robinson
13c730c10e - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 2015-11-10 16:21:49 +00:00
Dennis Gilmore
13ef95ae8f - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-18 19:53:45 +00:00
Kalev Lember
b7fd65cd9f Rebuilt for GCC 5 C++11 ABI change 2015-05-02 16:58:37 +02:00
Zbigniew Jędrzejewski-Szmek
b9a2f5516d Modernize macro usage 2015-02-26 00:19:20 -05:00
Zbigniew Jędrzejewski-Szmek
9411cfc02e Use one dir for Python 2 and 3 builds
Because of __pycache__ and .so suffix in Python 3, nothing should conflict.
2015-02-26 00:19:20 -05:00
Zbigniew Jędrzejewski-Szmek
9c2074e497 Split out more backend subpackages 2015-02-25 23:42:38 -05:00
Zbigniew Jędrzejewski-Szmek
732ad8bbfe Simplify ifdeffery a bit 2015-02-25 21:38:17 -05:00
Zbigniew Jędrzejewski-Szmek
8c9cc20e2a Use %license 2015-02-25 00:16:39 -05:00
Zbigniew Jędrzejewski-Szmek
76883b8317 Add dependency on python-scikit-image, dot, tex-preview
It seems to be used in documentation generation.
2015-02-25 00:16:19 -05:00
Zbigniew Jędrzejewski-Szmek
98dd5e3da2 New sources 2015-02-24 23:07:02 -05:00
Zbigniew Jędrzejewski-Szmek
dd3b8abfa9 Pull in changes from https://github.com/QuLogic/rpmbuild-specs 2015-02-24 22:17:01 -05:00
Peter Robinson
3d4898c537 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-17 21:24:49 +00:00
Dennis Gilmore
3b5c19b1c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 16:20:47 -05:00
Jaroslav Škarvada
d42870f60f - Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 2014-05-21 12:33:05 +02:00
Slavek Kabrda
68e041327a Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 2014-05-16 13:40:58 +02:00
pcpa
7731b0f8b4 Make TkAgg the default backend 2014-02-11 12:17:25 -02:00
pcpa
8736c81a32 Disable check because it randomly fails in koji build 2014-01-28 16:05:45 -02:00
pcpa
12e8a6231d Cconditionally to bundle fonts (#1047559) 2014-01-28 14:50:22 -02:00
Thomas Spura
b69e56e8d0 Also actually add setup.cfg 2014-01-25 17:22:54 +01:00
Thomas Spura
be26c9bf21 Update to 1.3.1 and use GTKAgg backend
bugs closed: #1030396, #982793, #1049624
2014-01-25 17:06:52 +01:00
Thomas Spura
f7ffbd877f BR: python-numpydoc when building html docs 2013-08-08 11:29:07 +02:00
Thomas Spura
14b1524911 Also fix day of last changelog entry 2013-08-07 15:59:17 +02:00
Thomas Spura
674876c696 Fix Changelog date entry 2013-08-07 15:58:02 +02:00
Thomas Spura
81fc2e8024 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)
2013-08-07 15:53:33 +02:00
Dennis Gilmore
0a7be6ae46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-04 03:23:38 -05:00
Jon Ciesla
e5fc5ec392 agg rebuild. 2013-06-10 08:13:13 -05:00
Thomas Spura
90bbb1ede9 include __pycache__ files in correct subpackages on python3 2013-04-11 09:48:33 +02:00
Thomas Spura
c4143b65b0 use python3 version in python3-matplotlib-qt4 (#915727) 2013-04-10 15:58:01 +02:00
Thomas Spura
83a27676aa Decode output of subprocess to utf-8 or regex will fail (#928326) 2013-04-03 02:24:20 +02:00
pcpa
adaf51ea57 Stix-fonts are a requires, not build requires 2013-04-02 13:26:23 -03:00
pcpa
ab00be2ba0 Make stix-fonts a requires of matplotlib (#928326) 2013-04-02 13:20:33 -03:00
pcpa
b2c1943ea5 Correct rhbz #908717, #912843 and #928326 2013-03-28 16:13:18 -03:00
Dennis Gilmore
c89b645d96 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 13:50:08 -06:00
pcpa
b58a0f66d3 Address side effects of using fontconfig by default 2013-01-16 18:49:17 -02:00
pcpa
eb9a122389 Use fontconfig by default (#885307) 2013-01-16 13:59:10 -02:00
David Malcolm
11c0529c89 remove wx support for rhel >= 7 2013-01-03 15:16:14 -05:00
pcpa
bce7fc7101 Do not run install under xvfb-run, it causes koji build to fail. 2012-12-05 00:16:10 -02:00
pcpa
f2d3f53a8d Correct wrong dependency of main package on the tk backend.
- 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.
2012-12-04 23:31:08 -02:00
pcpa
03883d02e8 Obsolete python-matplotlib-wx for clean updates.
The python-matplotlib-wx package was only two python files (sans pyc & pyo),
that actually now are merged in the main package. This is a packaging issue
that should be corrected by also adding extra backend subpackages, but those
need extra packages in fedora. There are actually several other backends
that were in the main package, but the ones with .so files are split (main
package and tk backend).
2012-11-27 20:04:23 -02:00
pcpa
5e8c5cddc3 Update metadata after fedpkg new-sources 2012-11-27 18:24:48 -02:00
pcpa
cfeed65034 Update to matplotlib 1.2.0 (#837156) 2012-11-27 18:01:54 -02:00
Dennis Gilmore
8a5f96fc9d - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-21 02:08:31 -05:00
David Malcolm
2114656575 1.0.1-20: remove wx support for rhel >= 7
* Wed Apr 18 2012 David Malcolm <dmalcolm@redhat.com> - 1.0.1-20
- remove wx support for rhel >= 7
2012-04-18 16:25:06 -04:00
Dennis Gilmore
05e0e0bf4c - Rebuilt for c++ ABI breakage 2012-02-28 13:45:09 -06:00
Dennis Gilmore
887890bd4a - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 19:52:36 -06:00
David Malcolm
70576db6a2 add link to upstream libpng 1.5 issue 2011-12-06 17:04:00 -05:00
David Malcolm
630c235008 fix the build against libpng 1.5 2011-12-06 16:55:19 -05:00
David Malcolm
313dac93e1 fix egg-info conditional for RHEL 2011-12-06 15:10:01 -05:00
Adam Jackson
04e2e0f563 Rebuild for new libpng 2011-12-06 00:56:12 -05:00
Dan Horák
5446c87d15 fix build with new Tkinter which doesn't return an expected value in __version__ 2011-10-31 15:24:03 +01:00
Jef Spaleta
15f4723084 apply upstream bugfix for timezone formatting (Bug 735677) 2011-09-15 14:48:08 -08:00
Jef Spaleta
aacc15245c apply upstream bugfix for timezone formatting (Bug 735677) 2011-09-15 14:47:56 -08:00
Orion Poplawski
e461fe631e Add Requires dvipng (Bug 684836)
Build against system agg (Bug 612807)
Use system pyparsing (Bug 702160)
2011-05-20 16:44:50 -06:00
Jonathan G. Underwood
43d2ec145e Set PYTHONPATH during html doc building using find to prevent broken builds 2011-02-26 20:26:27 +00:00
Jonathan G. Underwood
664c62f2ee Spec file cleanups for readability 2011-02-26 15:58:18 +00:00
Jonathan G. Underwood
c7aa1a060f Bump and rebuild 2011-02-26 15:21:11 +00:00
Jonathan G. Underwood
51417023ef Fix spec file typos so package builds 2011-02-26 12:12:37 +00:00
Jonathan G. Underwood
0e79a43bbf Remove a debugging echo statement from the spec file
Fix some line endings and permissions in -doc sub-package
2011-02-25 17:07:26 +00:00
Jonathan G. Underwood
680c73ce28 Spec file cleanups to silence some rpmlint warnings 2011-02-25 15:24:34 +00:00
Jonathan G. Underwood
06e45f0087 Add arch specific Requires for tk, wx and doc sub-packages 2011-02-22 11:30:27 +00:00
Jonathan G. Underwood
ab4076906b No longer designate -doc subpackage as noarch 2011-02-22 11:25:49 +00:00
Jonathan G. Underwood
a48cf833ac Add default attr to doc sub-package file list 2011-02-22 11:24:05 +00:00
Jonathan G. Underwood
f26192de70 Make -doc sub-package noarch 2011-02-22 00:50:28 +00:00
Jonathan G. Underwood
fa5fd50bfc Enable wxPython backend 2011-02-22 00:49:54 +00:00
Jonathan G. Underwood
fd9734a7cb Remove unused patches 2011-02-21 23:08:32 +00:00
Jonathan G. Underwood
f48deece5c Build docs with low res images. Requires matplotlib-1.0.1-plot_directive.patch 2011-02-21 23:07:53 +00:00
Jonathan G. Underwood
a706a1d6d8 Add conditional for optionally building doc sub-package 2011-02-21 22:11:02 +00:00
Jonathan G. Underwood
838673b84e Build and package html docs in -doc subpackage. Move examples to -doc subpackage. 2011-02-21 18:30:38 +00:00
Thomas Spura
eb0ae8e8e8 - update to new version
- filter private *.so files
2011-02-18 11:09:44 +01:00
Dennis Gilmore
7d37cb09bb - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-08 23:04:15 -06:00
Fedora Release Engineering
22c9c0ba19 dist-git conversion 2010-07-29 10:30:00 +00:00
dmalcolm
3d8aca5cf3 - Rebuilt for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
2010-07-22 04:41:43 +00:00
Jef Spaleta
e8b7d4f3da - New upstream release
- Remove undistributable file from bundled agg library
2010-07-11 01:24:21 +00:00
Jef Spaleta
8ff61b63f9 - New upstream release 2010-07-02 00:05:06 +00:00
Jef Spaleta
8e35b281db - Upstream patch to fix deprecated gtk tooltip warning. 2010-05-27 17:54:31 +00:00
Jef Spaleta
75838bcea2 - Bump to rebuild against numpy 1.3 2010-04-13 04:51:58 +00:00
Jef Spaleta
5fb5eb7257 - Bump to rebuild against numpy 1.4.0 2010-04-01 22:39:55 +00:00
Jon Ciesla
18886006d6 Update to 0.99.1.2 2009-12-11 16:49:00 +00:00
Bill Nottingham
25dcdf9304 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 23:31:57 +00:00
Jesse Keating
8e942f943d - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild 2009-07-26 20:38:59 +00:00
Jef Spaleta
7cfd478d83 - Fixed font dep after font guideline change 2009-03-06 19:57:23 +00:00
Jesse Keating
81520ceee1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild 2009-02-26 22:17:12 +00:00
Jef Spaleta
3566db3f26 - Add dep on DejaVu Sans font for default font support 2008-12-24 01:29:32 +00:00
Jef Spaleta
0ec477d6d6 - Latest upstream release
- Strip out included fonts
2008-12-23 07:50:29 +00:00
Ignacio Vazquez-Abrams
9009b116df Rebuild for Python 2.6 2008-11-29 15:36:09 +00:00
Jef Spaleta
e9f8234a67 - Latest upstream release 2008-08-07 01:19:40 +00:00
Jef Spaleta
36a86160e0 - Latest upstream release 2008-07-01 20:53:17 +00:00
Jef Spaleta
61aa382649 - gcc43 cleanups 2008-03-24 19:31:26 +00:00
Jef Spaleta
1f8c99bdef Updating source file 2008-03-21 20:22:36 +00:00
Jef Spaleta
1437e01b55 - New upstream version
- Adding Fedora specific setup.cfg from included template
- removed numarry and numerics build requirements
2008-03-21 20:19:00 +00:00
Jesse Keating
4b93d98283 - Autorebuild for GCC 4.3 2008-02-19 07:26:16 +00:00
alexlan
1ba7111ea4 - Fixed typo in spec. 2008-01-05 01:43:15 +00:00
alexlan
d1a8b707e3 - Support for Python Eggs for F9+ 2008-01-05 01:25:40 +00:00
alexlan
96119e78b7 - Rebuild for new Tcl 8.5 2008-01-04 05:15:38 +00:00
Orion Poplawski
d53984287e - Update license tag to Python
- Rebuild for BuildID
2007-08-23 16:07:50 +00:00
Orion Poplawski
bb617decf4 Update to 0.90.1 2007-06-04 17:35:30 +00:00
17 changed files with 1081 additions and 137 deletions

View File

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

8
.gitignore vendored Normal file
View File

@@ -0,0 +1,8 @@
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
/matplotlib-1.4.3-without-gpc.tar.xz
/matplotlib-1.4.3-without-extern.tar.xz

View File

@@ -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
@@ -658,10 +658,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
@@ -786,7 +788,7 @@ def matplotlib_fname():
home, '.matplotlib', 'matplotlibrc')
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')

View File

@@ -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
@@ -1143,7 +1143,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,

View File

@@ -0,0 +1,50 @@
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.
"""
figW, figH = self._fig.get_size_inches()
@@ -250,12 +250,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)
@@ -298,12 +298,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

View File

@@ -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
@@ -301,7 +301,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'] = [

View File

@@ -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)

21
generate-tarball.sh Executable file
View File

@@ -0,0 +1,21 @@
#! /bin/sh
version=$1
[ -z $version ] && exit 1
dir=matplotlib-${version}
file=matplotlib-${version}.tar.gz
file=v${version}.tar.gz
result=matplotlib-${version}-without-extern.tar.xz
test -f $file || wget -v https://github.com/matplotlib/matplotlib/archive/$file
rm -rf matplotlib-${version}
tar xzf $file
rm -vr matplotlib-${version}/extern/qhull
rm -vr matplotlib-${version}/lib/matplotlib/mpl-data/sample_data/lena.*
rm -f $result
tar cJf $result $dir

View File

@@ -1,13 +0,0 @@
--- matplotlib-0.87/setup.py.orig 2006-02-14 11:11:32.000000000 -0700
+++ matplotlib-0.87/setup.py 2006-02-27 15:19:28.000000000 -0700
@@ -258,8 +258,8 @@
# packagers: set rc['numerix'] and rc['backend'] here to override the auto
# defaults, eg
-#rc['numerix'] = numpy
-#rc['backend'] = GTKAgg
+rc['numerix'] = 'numpy'
+rc['backend'] = 'GTKAgg'
if sys.platform=='win32':
rc = dict(backend='TkAgg', numerix='Numeric')
template = file('matplotlibrc.template').read()

View File

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

View File

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

View File

@@ -0,0 +1,32 @@
From 2e445c2c4f66f1e0de9779a3fd966aaf8d8ed2c5 Mon Sep 17 00:00:00 2001
From: Thomas A Caswell <tcaswell@gmail.com>
Date: Sun, 17 May 2015 23:45:44 -0400
Subject: [PATCH] Merge pull request #4439 from tswsl1989/restrict_dict_gdk
FIX : Import cbook.restrict_dict into backend_gdk
---
lib/matplotlib/backends/backend_gdk.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py
index fc705fe..024c27e 100644
--- a/lib/matplotlib/backends/backend_gdk.py
+++ b/lib/matplotlib/backends/backend_gdk.py
@@ -26,7 +26,7 @@ def fn_name(): return sys._getframe(1).f_code.co_name
from matplotlib._pylab_helpers import Gcf
from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import is_string_like
+from matplotlib.cbook import is_string_like, restrict_dict
from matplotlib.figure import Figure
from matplotlib.mathtext import MathTextParser
from matplotlib.transforms import Affine2D
@@ -477,7 +477,7 @@ def _print_image(self, filename, format, *args, **kwargs):
# set the default quality, if we are writing a JPEG.
# http://www.pygtk.org/docs/pygtk/class-gdkpixbuf.html#method-gdkpixbuf--save
- options = cbook.restrict_dict(kwargs, ['quality'])
+ options = restrict_dict(kwargs, ['quality'])
if format in ['jpg','jpeg']:
if 'quality' not in options:
options['quality'] = rcParams['savefig.jpeg_quality']

View File

@@ -0,0 +1,33 @@
--- setupext.py.orig 2013-08-02 09:39:43.914247832 +0200
+++ setupext.py 2013-08-02 09:40:14.785304342 +0200
@@ -914,28 +914,13 @@ class LibAgg(SetupPackage):
self.__class__.found_external = True
try:
return self._check_for_pkg_config(
- 'libagg', 'agg2/agg_basics.h', min_version='PATCH')
+ 'libagg', 'agg2/agg_basics.h', min_version='2.5.0')
except CheckFailed as e:
self.__class__.found_external = False
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('extern/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('extern', 'agg24', 'src', x) for x in agg_sources)
+ pkg_config.setup_extension(ext, 'libagg', default_include_dirs=["/usr/include/agg2"])
class FreeType(SetupPackage):

View File

@@ -0,0 +1,18 @@
--- setupext.py.orig 2014-01-25 15:06:39.460916454 +0100
+++ setupext.py 2014-01-25 15:06:53.080946205 +0100
@@ -841,15 +841,6 @@
name = 'pycxx'
def check(self):
- if PY3:
- # There is no version of PyCXX in the wild that will work
- # with Python 3.x and matplotlib, since they lack support
- # for the buffer object.
- self.__class__.found_external = False
- return ("Official versions of PyCXX are not compatible "
- "with matplotlib on Python 3.x, since they lack "
- "support for the buffer object. Using local "
- "copy")
self.__class__.found_external = True
old_stdout = sys.stdout

View File

@@ -1,80 +1,880 @@
%{!?python_sitearch: %define 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
# On Fedora 21 onwards, enable Qt5 backend:
%if 0%{?fedora} >= 21
%global with_qt5 1
%else
%global with_qt5 0
%endif
# the default backend; one of GTK GTKAgg GTKCairo GTK3Agg GTK3Cairo
# CocoaAgg MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG
%global backend TkAgg
%if "%{backend}" == "TkAgg"
%global backend_subpackage tk
%else
% if "%{backend}" == "Qt4Agg"
%global backend_subpackage qt4
% else
% if "%{backend}" == "Qt5Agg"
%global backend_subpackage qt5
% endif
% endif
%endif
# https://fedorahosted.org/fpc/ticket/381
%global with_bundled_fonts 1
# Use the same directory of the main package for subpackage licence and docs
%global _docdir_fmt %{name}
Name: python-matplotlib
Version: 0.90.0
Release: 3%{?dist}
Summary: Python plotting library
Version: 1.4.3
Release: 13%{?dist}
Summary: Python 2D plotting library
Group: Development/Libraries
License: Python Software Foundation License
URL: http://sourceforge.net/projects/matplotlib
Source0: http://dl.sf.net/matplotlib/matplotlib-%{version}.tar.gz
Patch0: matplotlib-0.87.7-matplotlibrc.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)
# qt4_editor backend is MIT
License: Python and MIT
URL: http://matplotlib.org
#Modified Sources to remove the bundled libraries
Source0: matplotlib-%{version}-without-extern.tar.xz
Source1: setup.cfg
BuildRequires: python-devel, freetype-devel, libpng-devel, zlib-devel
BuildRequires: pygtk2-devel, gtk2-devel, tkinter, tk-devel
BuildRequires: python-numeric, pytz, python-dateutil, numpy, python-numarray
Requires: numpy, pytz, python-dateutil
Requires: pycairo >= 1.2.0
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: 70_bts720549_try_StayPuft_for_xkcd.patch
Patch6: matplotlib-1.4.3-cbook.restrict_dict.patch
BuildRequires: agg-devel
BuildRequires: freetype-devel
BuildRequires: libpng-devel
BuildRequires: qhull-devel
BuildRequires: python-six
BuildRequires: numpy
BuildRequires: pyparsing
BuildRequires: python-pycxx-devel
BuildRequires: python-dateutil
BuildRequires: python-setuptools
%if %{with_html}
BuildRequires: python-numpydoc
BuildRequires: python-scikit-image
%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
%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 Numeric for handling large data sets and supports a variety
of output backends
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 tk
Summary: Tk backend for python-matplotlib
%package -n python2-matplotlib
Summary: Python 2D plotting library
%{?python_provide:%python_provide python2-matplotlib}
Requires: dejavu-sans-fonts
Requires: dvipng
Requires: python-six
Requires: numpy
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}
%{?backend_subpackage:Requires: python2-matplotlib-%{backend_subpackage}%{?_isa} = %{version}-%{release}}
%description -n python2-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 python2-matplotlib-qt4
%{?python_provide:%python_provide python2-matplotlib-qt4}
Summary: Qt4 backend for python-matplotlib
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: tkinter
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
Requires: python2-matplotlib-qt5
BuildRequires: PyQt4-devel
Requires: PyQt4
%description tk
%description -n python2-matplotlib-qt4
%{summary}
%if %{with_qt5}
%package -n python2-matplotlib-qt5
%{?python_provide:%python_provide python2-matplotlib-qt5}
Summary: Qt5 backend for python-matplotlib
Group: Development/Libraries
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
BuildRequires: python-qt5
Requires: python-qt5
%description -n python2-matplotlib-qt5
%{summary}
%endif # with_qt5
%package -n python2-matplotlib-gtk
%{?python_provide:%python_provide python2-matplotlib-gtk}
Summary: GTK backend for python-matplotlib
Group: Development/Libraries
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
BuildRequires: gtk2-devel
BuildRequires: pygtk2-devel
BuildRequires: pycairo-devel
Requires: pycairo
Requires: pygtk2
%description -n python2-matplotlib-gtk
%{summary}
%package -n python2-matplotlib-gtk3
%{?python_provide:%python_provide python2-matplotlib-gtk3}
Summary: GTK3 backend for python-matplotlib
Group: Development/Libraries
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
# This should be converted to typelib(Gtk) when supported
BuildRequires: gtk3
BuildRequires: pygobject3-base
Requires: gtk3%{?_isa}
Requires: pygobject3-base%{?_isa}
%description -n python2-matplotlib-gtk3
%{summary}
%package -n python2-matplotlib-tk
%{?python_provide:%python_provide python2-matplotlib-tk}
Summary: Tk backend for python-matplotlib
Group: Development/Libraries
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
BuildRequires: tcl-devel
BuildRequires: tkinter
BuildRequires: tk-devel
Requires: tkinter
%description -n python2-matplotlib-tk
%{summary}
%if %{with_wx}
%package -n python2-matplotlib-wx
%{?python_provide:%python_provide python2-matplotlib-wx}
Summary: wxPython backend for python-matplotlib
Group: Development/Libraries
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
BuildRequires: wxPython-devel
Requires: wxPython
%description -n python2-matplotlib-wx
%{summary}
%endif # with_wx
%package -n python2-matplotlib-doc
%{?python_provide:%python_provide python2-matplotlib-doc}
Summary: Documentation files for python-matplotlib
Group: Documentation
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
%if %{with_html}
BuildRequires: python-sphinx
BuildRequires: tex(latex)
BuildRequires: tex-preview
BuildRequires: dvipng
BuildRequires: graphviz
%endif
%description -n python2-matplotlib-doc
%{summary}
%package -n python-matplotlib-data
%{?python_provide:%python_provide python-matplotlib-data}
Summary: Data used by python-matplotlib
%if %{with_bundled_fonts}
Requires: python-matplotlib-data-fonts = %{version}-%{release}
%endif
BuildArch: noarch
%description -n python-matplotlib-data
%{summary}
%if %{with_bundled_fonts}
%package -n python-matplotlib-data-fonts
%{?python_provide:%python_provide python-matplotlib-data-fonts}
Summary: Fonts used by python-matplotlib
Requires: python-matplotlib-data = %{version}-%{release}
BuildArch: noarch
%description -n python-matplotlib-data-fonts
%{summary}
%endif
%if %{with_python3}
%package -n python3-matplotlib
%{?python_provide:%python_provide 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-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}
Requires: python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
%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
%{?python_provide:%python_provide python3-matplotlib-qt4}
Summary: Qt4 backend for python3-matplotlib
Group: Development/Libraries
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
Requires: python3-matplotlib-qt5
BuildRequires: python3-PyQt4-devel
Requires: python3-PyQt4
%description -n python3-matplotlib-qt4
%{summary}
%if %{with_qt5}
%package -n python3-matplotlib-qt5
%{?python_provide:%python_provide python3-matplotlib-qt5}
Summary: Qt5 backend for python3-matplotlib
Group: Development/Libraries
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
BuildRequires: python3-qt5
Requires: python3-qt5
%description -n python3-matplotlib-qt5
%{summary}
%endif # with_qt5
# gtk2 never worked in Python 3 afaict, so no need for -gtk subpackage
%package -n python3-matplotlib-gtk3
%{?python_provide:%python_provide python3-matplotlib-gtk3}
Summary: GTK3 backend for python3-matplotlib
Group: Development/Libraries
Requires: python3-matplotlib%{?_isa} = %{version}-%{release}
# This should be converted to typelib(Gtk) when supported
BuildRequires: gtk3
BuildRequires: python3-gobject
Requires: gtk3%{?_isa}
Requires: python3-gobject%{?_isa}
%description -n python3-matplotlib-gtk3
%{summary}
%package -n python3-matplotlib-tk
%{?python_provide:%python_provide 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}
%patch0 -p1 -b .matplotlibrc
%patch1 -p1 -b .tkagg
%patch2 -p1 -b .pygtk
chmod -x images/*.svg
# Copy setup.cfg to the builddir
sed 's/\(backend = \).*/\1%{backend}/' >setup.cfg <%{SOURCE1}
# 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.4.3 ]; 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
# Remove references to bundled libraries
%patch0 -b .noagg
%patch1 -b .cxx
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
chmod -x lib/matplotlib/mpl-data/images/*.svg
%build
%{__python} setup.py build
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
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}
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
%endif
%install
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
MPLCONFIGDIR=$PWD \
MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \
%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
chmod +x %{buildroot}%{python2_sitearch}/matplotlib/dates.py
mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/matplotlib
mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data/matplotlibrc \
%{buildroot}%{_sysconfdir}
mv %{buildroot}%{python2_sitearch}/matplotlib/mpl-data \
%{buildroot}%{_datadir}/matplotlib
%if !%{with_bundled_fonts}
rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%if %{with_python3}
MPLCONFIGDIR=$PWD/.. \
MATPLOTLIBDATA=$PWD/../lib/matplotlib/mpl-data/ \
%{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
chmod +x %{buildroot}%{python3_sitearch}/matplotlib/dates.py
rm -fr %{buildroot}%{python3_sitearch}/matplotlib/mpl-data
rm -f %{buildroot}%{python3_sitearch}/six.py
%endif
%files
%defattr(-,root,root,-)
%doc README license/LICENSE license/LICENSE_enthought.txt
%doc license/LICENSE_PAINT license/LICENSE_PIL
%doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
%doc NUMARRAY_ISSUES PKG-INFO TODO examples
%{python_sitearch}/matplotlib/
%{python_sitearch}/pylab.py*
%exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
%exclude %{python_sitearch}/matplotlib/backends/tkagg.*
%exclude %{python_sitearch}/matplotlib/backends/_tkagg.so
%if %{run_tests}
%check
# This should match the default backend
echo "backend : %{backend}" > matplotlibrc
MPLCONFIGDIR=$PWD \
MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
PYTHONPATH=%{buildroot}%{python2_sitearch} \
xvfb-run %{__python} -c "import matplotlib; matplotlib.test()"
%files tk
%{python_sitearch}/matplotlib/backends/backend_tkagg.py*
%{python_sitearch}/matplotlib/backends/tkagg.py*
%{python_sitearch}/matplotlib/backends/_tkagg.so
%if %{with_python3}
MPLCONFIGDIR=$PWD \
MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \
PYTHONPATH=%{buildroot}%{python3_sitearch} \
xvfb-run %{__python3} -c "import matplotlib; matplotlib.test()"
%endif
%endif # run_tests
%files -n python2-matplotlib
%license LICENSE/
%doc README.rst
%doc CHANGELOG
%doc PKG-INFO
%{python2_sitearch}/*egg-info
%{python2_sitearch}/matplotlib-*-nspkg.pth
%{python2_sitearch}/matplotlib/
%{python2_sitearch}/mpl_toolkits/
%{python2_sitearch}/pylab.py*
%exclude %{python2_sitearch}/matplotlib/backends/backend_qt4*
%exclude %{python2_sitearch}/matplotlib/backends/backend_qt5*
%exclude %{python2_sitearch}/matplotlib/backends/backend_gtk*
%exclude %{python2_sitearch}/matplotlib/backends/_gtkagg.*
%exclude %{python2_sitearch}/matplotlib/backends/backend_tkagg.*
%exclude %{python2_sitearch}/matplotlib/backends/tkagg.*
%exclude %{python2_sitearch}/matplotlib/backends/_tkagg.so
%exclude %{python2_sitearch}/matplotlib/backends/backend_wx.*
%exclude %{python2_sitearch}/matplotlib/backends/backend_wxagg.*
%exclude %{_pkgdocdir}/*/
%files -n python2-matplotlib-qt4
%{python2_sitearch}/matplotlib/backends/backend_qt4.*
%{python2_sitearch}/matplotlib/backends/backend_qt4agg.*
%if %{with_qt5}
%files -n python2-matplotlib-qt5
%{python2_sitearch}/matplotlib/backends/backend_qt5.*
%{python2_sitearch}/matplotlib/backends/backend_qt5agg.*
%endif # with_qt5
%files -n python2-matplotlib-gtk
%{python2_sitearch}/matplotlib/backends/backend_gtk.py*
%{python2_sitearch}/matplotlib/backends/backend_gtkagg.py*
%{python2_sitearch}/matplotlib/backends/backend_gtkcairo.py*
%{python2_sitearch}/matplotlib/backends/_gtkagg.so
%files -n python2-matplotlib-gtk3
%{python2_sitearch}/matplotlib/backends/backend_gtk3*.py*
%files -n python2-matplotlib-tk
%{python2_sitearch}/matplotlib/backends/backend_tkagg.py*
%{python2_sitearch}/matplotlib/backends/tkagg.py*
%{python2_sitearch}/matplotlib/backends/_tkagg.so
%if %{with_wx}
%files -n python2-matplotlib-wx
%{python2_sitearch}/matplotlib/backends/backend_wx.*
%{python2_sitearch}/matplotlib/backends/backend_wxagg.*
%endif # with_wx
%files -n python2-matplotlib-doc
%doc examples
%if %{with_html}
%doc doc/build/html/*
%endif
%files -n python-matplotlib-data
%{_sysconfdir}/matplotlibrc
%{_datadir}/matplotlib/mpl-data/
%if %{with_bundled_fonts}
%exclude %{_datadir}/matplotlib/mpl-data/fonts/
%endif
%if %{with_bundled_fonts}
%files -n python-matplotlib-data-fonts
%{_datadir}/matplotlib/mpl-data/fonts/
%endif
%if %{with_python3}
%files -n python3-matplotlib
%license LICENSE/
%doc README.rst
%doc CHANGELOG
%doc PKG-INFO
%{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_qt5*
%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5*
%exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*
%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk*
%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 %{_pkgdocdir}/*/
%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.*
%if %{with_qt5}
%files -n python3-matplotlib-qt5
%{python3_sitearch}/matplotlib/backends/backend_qt5.*
%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*
%{python3_sitearch}/matplotlib/backends/backend_qt5agg.*
%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*
%endif # with_qt5
%files -n python3-matplotlib-gtk3
%{python3_sitearch}/matplotlib/backends/backend_gtk*
%{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk*
%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
* Mon Apr 04 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-13
- Require the qt5 subpackage from the qt4 subpackage (#1219556)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Jan 12 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-11
- Fix another requires of the main package
* Thu Jan 07 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-10
- Fix requiring the correct backend from the main package
* Thu Jan 07 2016 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-9
- regenerate tarball to exclude lena image (#1295174)
* Sun Nov 15 2015 Thomas Spura <tomspur@fedoraproject.org> - 1.4.3-8
- Pick upstream patch for fixing the gdk backend #1231748
- Add python2 subpackages and use python_provide
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-7
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.4.3-5
- Rebuilt for GCC 5 C++11 ABI change
* Wed Feb 25 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.4.3-4
- Split out python-matplotlib-gtk, python-matplotlib-gtk3,
python3-matplotlib-gtk3 subpackages (#1067373)
- Add missing requirements on gtk
* Tue Feb 24 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.4.3-3
- Use %%license, add skimage to build requirements
* Tue Feb 17 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.3-2
- Disable Qt5 backend on Fedora <21 and RHEL
* Tue Feb 17 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.3-1
- New upstream release (#1134007)
- Add Qt5 backend
* Tue Jan 13 2015 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.2-1
- Bump to new upstream release
- Add qhull-devel to BR
- Add six to Requires
* 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
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Dec 6 2011 David Malcolm <dmalcolm@redhat.com> - 1.0.1-17
- fix the build against libpng 1.5
* Tue Dec 6 2011 David Malcolm <dmalcolm@redhat.com> - 1.0.1-16
- fix egg-info conditional for RHEL
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.0.1-15
- Rebuild for new libpng
* 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
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-10
- Spec file cleanups for readability
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-9
- Bump and rebuild
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-8
- Fix spec file typos so package builds
* Fri Feb 25 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-7
- Remove a debugging echo statement from the spec file
- Fix some line endings and permissions in -doc sub-package
* Fri Feb 25 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-6
- Spec file cleanups to silence some rpmlint warnings
* Mon Feb 21 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-5
- Add default attr to doc sub-package file list
- No longer designate -doc subpackage as noarch
- Add arch specific Requires for tk, wx and doc sub-packages
* Mon Feb 21 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-4
- Enable wxPython backend
- Make -doc sub-package noarch
* Mon Feb 21 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-3
- Add conditional for optionally building doc sub-package
- Add flag to build low res images for documentation
- Add matplotlib-1.0.1-plot_directive.patch to fix build of low res images
- Remove unused patches
* Sat Feb 19 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-2
- Build and package HTML documentation in -doc sub-package
- Move examples to -doc sub-package
- Make examples non-executable
* Fri Feb 18 2011 Thomas Spura <tomspur@fedoraproject.org> - 1.0.1-1
- update to new bugfix version (#678489)
- set file attributes in tk subpackage
- filter private *.so
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* 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
* 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
- 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
- removed numarry and numerics build requirements
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.90.1-6
- Autorebuild for GCC 4.3
* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-5
- Fixed typo in spec.
* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-4
- Support for Python Eggs for F9+
* Thu Jan 3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-3
- Rebuild for new Tcl 8.5
* 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
@@ -84,8 +884,8 @@ 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
- Add examples to %docs
* 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
- Release bump for rebuild against python 2.5 in devel tree
@@ -166,7 +966,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Jun 30 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-2
- Rename to python-matplotlib
- Remove unneeded Requires: python
- Add private directories to %files
- Add private directories to %%files
* Tue Jun 28 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-1
- Initial package for Fedora Extras

2
setup.cfg Normal file
View File

@@ -0,0 +1,2 @@
[rc_options]
backend = GTKAgg

View File

@@ -1 +1 @@
31ea12395826080b5be9c1e292cda6f1 matplotlib-0.90.0.tar.gz
c16111ce7d6c799a2b557699f40eb709 matplotlib-1.4.3-without-extern.tar.xz