From eb9a122389b7ec7e33d9816fa669d7cb1f04521a Mon Sep 17 00:00:00 2001 From: pcpa Date: Jan 16 2013 15:59:10 +0000 Subject: Use fontconfig by default (#885307) --- diff --git a/python-matplotlib-fontconfig.patch b/python-matplotlib-fontconfig.patch new file mode 100644 index 0000000..6b9676b --- /dev/null +++ b/python-matplotlib-fontconfig.patch @@ -0,0 +1,12 @@ +diff -up matplotlib-1.2.0/lib/matplotlib/font_manager.py.orig matplotlib-1.2.0/lib/matplotlib/font_manager.py +--- matplotlib-1.2.0/lib/matplotlib/font_manager.py.orig 2013-01-16 13:42:53.917687221 -0200 ++++ matplotlib-1.2.0/lib/matplotlib/font_manager.py 2013-01-16 13:43:13.987687989 -0200 +@@ -62,7 +62,7 @@ try: + except ImportError: + import pickle + +-USE_FONTCONFIG = False ++USE_FONTCONFIG = True + + verbose = matplotlib.verbose + diff --git a/python-matplotlib.spec b/python-matplotlib.spec index ae713b7..79193f8 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -17,7 +17,7 @@ Name: python-matplotlib Version: 1.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Python 2D plotting library Group: Development/Libraries License: Python @@ -30,6 +30,8 @@ Source0: matplotlib-%{version}-without-gpc.tar.gz Patch0: %{name}-noagg.patch Patch1: %{name}-tk.patch +# http://sourceforge.net/mailarchive/message.php?msg_id=30202451 +Patch2: %{name}-fontconfig.patch BuildRequires: agg-devel BuildRequires: freetype-devel @@ -175,6 +177,9 @@ sed -i -e s/matplotlib\.pyparsing_py./pyparsing/g lib/matplotlib/*.py %patch1 -p1 -b .tk sed -i -e 's|@@libdir@@|%{_libdir}|' setupext.py +# Use fontconfig by default +%patch2 -p1 -b .fontconfig + chmod -x lib/matplotlib/mpl-data/images/*.svg %if %{?with_python3} @@ -294,6 +299,9 @@ popd %endif %changelog +* Wed Jan 16 2013 pcpa - 1.2.0-7 +- Use fontconfig by default (#885307) + * Thu Jan 3 2013 David Malcolm - 1.2.0-6 - remove wx support for rhel >= 7