Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
53aef6c52e | ||
|
|
8e6fb6a047 | ||
|
|
95c4d0eaf5 | ||
|
|
cfae272b51 | ||
|
|
c901c6602b | ||
|
|
96f1b73a85 | ||
|
|
e065ba8c72 | ||
|
|
108153e46c | ||
|
|
69fbdf849b | ||
|
|
a0ff1b7b0d | ||
|
|
a9a2c96250 | ||
|
|
5ddd160fd3 | ||
|
|
13c730c10e | ||
|
|
13ef95ae8f | ||
|
|
b7fd65cd9f | ||
|
|
b9a2f5516d | ||
|
|
9411cfc02e | ||
|
|
9c2074e497 | ||
|
|
732ad8bbfe | ||
|
|
8c9cc20e2a | ||
|
|
76883b8317 | ||
|
|
98dd5e3da2 | ||
|
|
dd3b8abfa9 | ||
|
|
3d4898c537 | ||
|
|
3b5c19b1c1 | ||
|
|
d42870f60f | ||
|
|
68e041327a | ||
|
|
7731b0f8b4 | ||
|
|
8736c81a32 | ||
|
|
12e8a6231d | ||
|
|
b69e56e8d0 | ||
|
|
be26c9bf21 | ||
|
|
f7ffbd877f | ||
|
|
14b1524911 | ||
|
|
674876c696 | ||
|
|
81fc2e8024 | ||
|
|
0a7be6ae46 |
4
.gitignore
vendored
4
.gitignore
vendored
@@ -2,3 +2,7 @@ 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
|
||||
|
||||
29
20_matplotlibrc_path_search_fix.patch
Normal file
29
20_matplotlibrc_path_search_fix.patch
Normal 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')
|
||||
14
40_bts608939_draw_markers_description.patch
Normal file
14
40_bts608939_draw_markers_description.patch
Normal 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,
|
||||
50
50_bts608942_spaces_in_param_args.patch
Normal file
50
50_bts608942_spaces_in_param_args.patch
Normal 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
|
||||
|
||||
19
70_bts720549_try_StayPuft_for_xkcd.patch
Normal file
19
70_bts720549_try_StayPuft_for_xkcd.patch
Normal 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'] = [
|
||||
@@ -6,14 +6,16 @@ version=$1
|
||||
|
||||
dir=matplotlib-${version}
|
||||
file=matplotlib-${version}.tar.gz
|
||||
result=matplotlib-${version}-without-gpc.tar.gz
|
||||
file=v${version}.tar.gz
|
||||
result=matplotlib-${version}-without-extern.tar.xz
|
||||
|
||||
wget -vc http://downloads.sourceforge.net/matplotlib/$file
|
||||
test -f $file || wget -v https://github.com/matplotlib/matplotlib/archive/$file
|
||||
|
||||
rm -rf matplotlib-${version}
|
||||
tar xzf $file
|
||||
|
||||
rm matplotlib-${version}/agg24/include/agg_conv_gpc.h
|
||||
rm -vr matplotlib-${version}/extern/qhull
|
||||
rm -vr matplotlib-${version}/lib/matplotlib/mpl-data/sample_data/lena.*
|
||||
|
||||
rm -f $result
|
||||
tar czf $result $dir
|
||||
tar cJf $result $dir
|
||||
|
||||
32
matplotlib-1.4.3-cbook.restrict_dict.patch
Normal file
32
matplotlib-1.4.3-cbook.restrict_dict.patch
Normal 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']
|
||||
@@ -1,64 +0,0 @@
|
||||
diff -ur matplotlib-1.2.0.orig/lib/matplotlib/font_manager.py matplotlib-1.2.0/lib/matplotlib/font_manager.py
|
||||
--- matplotlib-1.2.0.orig/lib/matplotlib/font_manager.py 2012-10-31 01:11:14.000000000 +0100
|
||||
+++ matplotlib-1.2.0/lib/matplotlib/font_manager.py 2013-04-03 01:50:34.433802284 +0200
|
||||
@@ -62,7 +62,7 @@
|
||||
except ImportError:
|
||||
import pickle
|
||||
|
||||
-USE_FONTCONFIG = False
|
||||
+USE_FONTCONFIG = True
|
||||
|
||||
verbose = matplotlib.verbose
|
||||
|
||||
@@ -771,7 +771,7 @@
|
||||
return float(self._size)
|
||||
except ValueError:
|
||||
pass
|
||||
- default_size = fontManager.get_default_size()
|
||||
+ default_size = FontManager.get_default_size()
|
||||
return default_size * font_scalings.get(self._size)
|
||||
|
||||
def get_file(self):
|
||||
@@ -991,7 +991,10 @@
|
||||
self.afmfiles = findSystemFonts(paths, fontext='afm') + \
|
||||
findSystemFonts(fontext='afm')
|
||||
self.afmlist = createFontList(self.afmfiles, fontext='afm')
|
||||
- self.defaultFont['afm'] = self.afmfiles[0]
|
||||
+ try:
|
||||
+ self.defaultFont['afm'] = self.afmfiles[0]
|
||||
+ except IndexError:
|
||||
+ self.defaultFont['afm'] = None
|
||||
|
||||
self.ttf_lookup_cache = {}
|
||||
self.afm_lookup_cache = {}
|
||||
@@ -1002,7 +1005,8 @@
|
||||
"""
|
||||
return self.__default_weight
|
||||
|
||||
- def get_default_size(self):
|
||||
+ @staticmethod
|
||||
+ def get_default_size():
|
||||
"""
|
||||
Return the default font size.
|
||||
"""
|
||||
@@ -1276,7 +1280,7 @@
|
||||
except OSError:
|
||||
return None
|
||||
if pipe.returncode == 0:
|
||||
- for match in _fc_match_regex.finditer(output):
|
||||
+ for match in _fc_match_regex.finditer(output.decode("utf-8")):
|
||||
file = match.group(1)
|
||||
if os.path.splitext(file)[1][1:] in fontexts:
|
||||
return file
|
||||
diff -ur matplotlib-1.2.0.orig/lib/matplotlib/mpl-data/matplotlibrc matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc
|
||||
--- matplotlib-1.2.0.orig/lib/matplotlib/mpl-data/matplotlibrc 2012-11-08 17:39:20.000000000 +0100
|
||||
+++ matplotlib-1.2.0/lib/matplotlib/mpl-data/matplotlibrc 2013-04-03 01:50:03.693755542 +0200
|
||||
@@ -198,7 +198,7 @@
|
||||
#mathtext.it : serif:italic
|
||||
#mathtext.bf : serif:bold
|
||||
#mathtext.sf : sans
|
||||
-#mathtext.fontset : cm # Should be 'cm' (Computer Modern), 'stix',
|
||||
+mathtext.fontset : stix # Should be 'cm' (Computer Modern), 'stix',
|
||||
# 'stixsans' or 'custom'
|
||||
#mathtext.fallback_to_cm : True # When True, use symbols from the Computer Modern
|
||||
# fonts when a symbol can not be found in one of
|
||||
@@ -1,73 +1,33 @@
|
||||
diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
|
||||
--- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:49:21.295712608 -0200
|
||||
+++ matplotlib-1.2.0/setupext.py 2012-11-23 14:49:31.508712999 -0200
|
||||
@@ -96,7 +96,6 @@ BUILT_GDK = False
|
||||
BUILT_PATH = False
|
||||
BUILT_TRI = False
|
||||
--- 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.'
|
||||
|
||||
-AGG_VERSION = 'agg24'
|
||||
TCL_TK_CACHE = None
|
||||
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"])
|
||||
|
||||
# for nonstandard installation/build with --prefix variable
|
||||
@@ -621,7 +620,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)
|
||||
@@ -1220,17 +1220,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')
|
||||
@@ -1253,16 +1243,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_vcgen_contour.cpp',
|
||||
- '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')
|
||||
@@ -1287,14 +1268,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'))
|
||||
|
||||
class FreeType(SetupPackage):
|
||||
|
||||
18
python-matplotlib-system-cxx.patch
Normal file
18
python-matplotlib-system-cxx.patch
Normal 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
|
||||
@@ -1,35 +0,0 @@
|
||||
diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
|
||||
--- matplotlib-1.2.0/setupext.py.orig 2012-11-23 14:50:48.954715965 -0200
|
||||
+++ matplotlib-1.2.0/setupext.py 2012-11-23 14:55:53.731727636 -0200
|
||||
@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib
|
||||
|
||||
tcl_poss = [tcl_lib_dir,
|
||||
os.path.normpath(os.path.join(tcl_lib_dir, '..')),
|
||||
- "/usr/lib/tcl"+str(Tkinter.TclVersion),
|
||||
- "/usr/lib"]
|
||||
+ "@@libdir@@/tcl"+str(Tkinter.TclVersion),
|
||||
+ "@@libdir@@"]
|
||||
tk_poss = [tk_lib_dir,
|
||||
os.path.normpath(os.path.join(tk_lib_dir, '..')),
|
||||
- "/usr/lib/tk"+str(Tkinter.TkVersion),
|
||||
- "/usr/lib"]
|
||||
+ "@@libdir@@/tk"+str(Tkinter.TkVersion),
|
||||
+ "@@libdir@@"]
|
||||
for ptcl, ptk in zip(tcl_poss, tk_poss):
|
||||
tcl_config = os.path.join(ptcl, "tclConfig.sh")
|
||||
tk_config = os.path.join(ptk, "tkConfig.sh")
|
||||
@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib
|
||||
return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
|
||||
|
||||
def hardcoded_tcl_config():
|
||||
- tcl_inc = "/usr/local/include"
|
||||
- tk_inc = "/usr/local/include"
|
||||
- tcl_lib = "/usr/local/lib"
|
||||
- tk_lib = "/usr/local/lib"
|
||||
+ tcl_inc = "/usr/include"
|
||||
+ tk_inc = "/usr/include"
|
||||
+ tcl_lib = "@@libdir@@"
|
||||
+ tk_lib = "@@libdir@@"
|
||||
return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
|
||||
|
||||
def add_tk_flags(module):
|
||||
@@ -4,8 +4,9 @@
|
||||
%else
|
||||
%global with_python3 0
|
||||
%endif
|
||||
%global __provides_exclude_from .*/site-packages/.*\\.so$
|
||||
%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
|
||||
@@ -14,53 +15,79 @@
|
||||
%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: 1.2.0
|
||||
Release: 14%{?dist}
|
||||
Version: 1.4.3
|
||||
Release: 13%{?dist}
|
||||
Summary: Python 2D plotting library
|
||||
Group: Development/Libraries
|
||||
License: Python
|
||||
# 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.2.0-without-gpc.tar.gz
|
||||
#92ada4ef4e7374d67e46e30bfb08c3fed068d680 matplotlib-1.2.0-without-gpc.tar.gz
|
||||
Source0: matplotlib-%{version}-without-gpc.tar.gz
|
||||
#Modified Sources to remove the bundled libraries
|
||||
Source0: matplotlib-%{version}-without-extern.tar.xz
|
||||
Source1: setup.cfg
|
||||
|
||||
Patch0: %{name}-noagg.patch
|
||||
Patch1: %{name}-tk.patch
|
||||
# http://sourceforge.net/mailarchive/message.php?msg_id=30202451
|
||||
# https://github.com/matplotlib/matplotlib/pull/1666
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=896182
|
||||
Patch2: %{name}-fontconfig.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: gtk2-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: qhull-devel
|
||||
BuildRequires: python-six
|
||||
BuildRequires: numpy
|
||||
BuildRequires: pycairo-devel
|
||||
BuildRequires: pygtk2-devel
|
||||
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
|
||||
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
|
||||
|
||||
%description
|
||||
Matplotlib is a python 2D plotting library which produces publication
|
||||
@@ -73,75 +100,181 @@ 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
|
||||
%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}%{?_isa} = %{version}-%{release}
|
||||
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
|
||||
Requires: python2-matplotlib-qt5
|
||||
BuildRequires: PyQt4-devel
|
||||
Requires: PyQt4
|
||||
|
||||
%description qt4
|
||||
%description -n python2-matplotlib-qt4
|
||||
%{summary}
|
||||
|
||||
%package tk
|
||||
%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: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: tcl-devel
|
||||
BuildRequires: tkinter
|
||||
BuildRequires: tk-devel
|
||||
Requires: tkinter
|
||||
|
||||
%description tk
|
||||
%description -n python2-matplotlib-tk
|
||||
%{summary}
|
||||
|
||||
%if %{with_wx}
|
||||
%package wx
|
||||
%package -n python2-matplotlib-wx
|
||||
%{?python_provide:%python_provide python2-matplotlib-wx}
|
||||
Summary: wxPython backend for python-matplotlib
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: wxPython-devel
|
||||
Requires: wxPython
|
||||
|
||||
%description wx
|
||||
%description -n python2-matplotlib-wx
|
||||
%{summary}
|
||||
%endif # with_wx
|
||||
|
||||
%package doc
|
||||
%package -n python2-matplotlib-doc
|
||||
%{?python_provide:%python_provide python2-matplotlib-doc}
|
||||
Summary: Documentation files for python-matplotlib
|
||||
Group: Documentation
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: python2-matplotlib%{?_isa} = %{version}-%{release}
|
||||
%if %{with_html}
|
||||
BuildRequires: python-sphinx
|
||||
BuildRequires: tex(latex)
|
||||
BuildRequires: tex-preview
|
||||
BuildRequires: dvipng
|
||||
BuildRequires: graphviz
|
||||
%endif
|
||||
|
||||
%description doc
|
||||
%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
|
||||
Requires: stix-math-fonts
|
||||
%else
|
||||
Requires: stix-fonts
|
||||
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
|
||||
@@ -155,16 +288,47 @@ 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: %{name}%{?_isa} = %{version}-%{release}
|
||||
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}
|
||||
@@ -178,34 +342,44 @@ Requires: python3-tkinter
|
||||
%prep
|
||||
%setup -q -n matplotlib-%{version}
|
||||
|
||||
# Remove bundled libraries
|
||||
rm -r agg24 lib/matplotlib/pyparsing_py?.py
|
||||
# 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 -p1 -b .noagg
|
||||
sed -i -e s/matplotlib\.pyparsing_py./pyparsing/g lib/matplotlib/*.py
|
||||
|
||||
# Correct tcl/tk detection
|
||||
%patch1 -p1 -b .tk
|
||||
sed -i -e 's|@@libdir@@|%{_libdir}|' setupext.py
|
||||
|
||||
# Use fontconfig by default
|
||||
%patch2 -p1 -b .fontconfig
|
||||
%patch0 -b .noagg
|
||||
%patch1 -b .cxx
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
chmod -x lib/matplotlib/mpl-data/images/*.svg
|
||||
|
||||
%if %{?with_python3}
|
||||
rm -rf %{py3dir}
|
||||
cp -a . %{py3dir}
|
||||
%endif
|
||||
|
||||
%build
|
||||
xvfb-run %{__python2} 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
|
||||
export PYTHONPATH=`realpath ../build/lib.linux*`
|
||||
%{__python2} make.py html
|
||||
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
|
||||
@@ -213,96 +387,146 @@ popd
|
||||
find examples -name '*.py' -exec chmod a-x '{}' \;
|
||||
|
||||
%if %{with_python3}
|
||||
pushd %{py3dir}
|
||||
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
|
||||
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
|
||||
%{__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
|
||||
|
||||
%if %{with_python3}
|
||||
pushd %{py3dir}
|
||||
%{__python3} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
|
||||
chmod +x $RPM_BUILD_ROOT%{python3_sitearch}/matplotlib/dates.py
|
||||
rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/matplotlib/mpl-data/fonts
|
||||
rm -f $RPM_BUILD_ROOT%{python3_sitearch}/six.py
|
||||
popd
|
||||
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
|
||||
|
||||
%files
|
||||
%doc README.txt
|
||||
%doc lib/dateutil_py2/LICENSE
|
||||
%doc lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
|
||||
%doc lib/pytz/LICENSE.txt
|
||||
%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
|
||||
|
||||
%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()"
|
||||
|
||||
%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 CXX
|
||||
%doc INSTALL
|
||||
%doc PKG-INFO
|
||||
%doc TODO
|
||||
%{python_sitearch}/*egg-info
|
||||
%{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.*
|
||||
%{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 qt4
|
||||
%{python_sitearch}/matplotlib/backends/backend_qt4.*
|
||||
%{python_sitearch}/matplotlib/backends/backend_qt4agg.*
|
||||
%files -n python2-matplotlib-qt4
|
||||
%{python2_sitearch}/matplotlib/backends/backend_qt4.*
|
||||
%{python2_sitearch}/matplotlib/backends/backend_qt4agg.*
|
||||
|
||||
%files tk
|
||||
%{python_sitearch}/matplotlib/backends/backend_tkagg.py*
|
||||
%{python_sitearch}/matplotlib/backends/tkagg.py*
|
||||
%{python_sitearch}/matplotlib/backends/_tkagg.so
|
||||
%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 wx
|
||||
%{python_sitearch}/matplotlib/backends/backend_wx.*
|
||||
%{python_sitearch}/matplotlib/backends/backend_wxagg.*
|
||||
%files -n python2-matplotlib-wx
|
||||
%{python2_sitearch}/matplotlib/backends/backend_wx.*
|
||||
%{python2_sitearch}/matplotlib/backends/backend_wxagg.*
|
||||
%endif # with_wx
|
||||
|
||||
%files doc
|
||||
%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
|
||||
%doc %{basepy3dir}/README.txt
|
||||
%doc %{basepy3dir}/lib/dateutil_py3/LICENSE
|
||||
%doc %{basepy3dir}/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX
|
||||
%doc %{basepy3dir}/lib/pytz/LICENSE.txt
|
||||
%doc %{basepy3dir}/CHANGELOG
|
||||
%doc %{basepy3dir}/CXX
|
||||
%doc %{basepy3dir}/INSTALL
|
||||
%doc %{basepy3dir}/PKG-INFO
|
||||
%doc %{basepy3dir}/TODO
|
||||
%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_qt4agg.*
|
||||
%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*
|
||||
%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 %{python3_sitearch}/matplotlib/backends/__pycache__/_tkagg.*
|
||||
%exclude %{_pkgdocdir}/*/
|
||||
|
||||
%files -n python3-matplotlib-qt4
|
||||
%{python3_sitearch}/matplotlib/backends/backend_qt4.*
|
||||
@@ -310,6 +534,18 @@ popd
|
||||
%{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.*
|
||||
@@ -319,6 +555,94 @@ popd
|
||||
%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.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user