diff --git a/python-matplotlib.changes b/python-matplotlib.changes index 36ff5b2..65e3dbc 100644 --- a/python-matplotlib.changes +++ b/python-matplotlib.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Jul 16 14:42:54 UTC 2014 - toddrme2178@gmail.com + +- Set dummy XDG_RUNTIME_DIR to fix building on openSUSE:Factory + +------------------------------------------------------------------- +Thu Apr 10 16:48:36 UTC 2014 - dmueller@suse.com + +- install LICENSE directory and fix license tag + +------------------------------------------------------------------- +Wed Apr 9 09:18:56 UTC 2014 - dmueller@suse.com + +- add use-setuptools.diff: build against old setuptools as well + ------------------------------------------------------------------- Fri Mar 28 15:48:46 UTC 2014 - speilicke@suse.com diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 853a89c..c96d58b 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -20,13 +20,14 @@ Name: python-matplotlib Version: 1.3.1 Release: 0 Summary: Plotting Library for Python -License: BSD-2-Clause +License: SUSE-Matplotlib Group: Development/Libraries/Python Url: http://sourceforge.net/projects/matplotlib Source: matplotlib-%{version}.tar.gz Source1: matplotlib-setup.cfg Source2: matplotlibplugin.py Source3: matplotlibwidget.py +Patch0: use-setuptools.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: fltk-devel @@ -187,13 +188,20 @@ for %{name} plotting package %prep %setup -q -n matplotlib-%{version} +%patch0 chmod -x lib/matplotlib/mpl-data/images/*.svg %build cp %{SOURCE1} ./setup.cfg +%if 0%{?suse_version} > 1310 +export XDG_RUNTIME_DIR=/tmp +%endif python setup.py build %install +%if 0%{?suse_version} > 1310 +export XDG_RUNTIME_DIR=/tmp +%endif python setup.py install --root=%{buildroot} --prefix=%{_prefix} # Install designer plugin @@ -207,7 +215,7 @@ install -vm 755 %{SOURCE3} %{buildroot}%{py_sitedir}/ %files %defattr(-,root,root,-) -%doc README.rst CHANGELOG PKG-INFO TODO CXX examples doc/users/license.rst +%doc README.rst LICENSE CHANGELOG PKG-INFO TODO CXX examples doc/users/license.rst %{py_sitedir}/matplotlib-%{version}_r0-py%{py_ver}.egg-info %{py_sitedir}/matplotlib-%{version}_r0-py%{py_ver}-nspkg.pth %{py_sitedir}/matplotlib/ diff --git a/use-setuptools.diff b/use-setuptools.diff new file mode 100644 index 0000000..afd0c0a --- /dev/null +++ b/use-setuptools.diff @@ -0,0 +1,14 @@ +--- setup.py ++++ setup.py +@@ -5,10 +5,7 @@ + + from __future__ import print_function, absolute_import + +-# This needs to be the very first thing to use distribute +-from distribute_setup import use_setuptools +-use_setuptools() +- ++import setuptools + import sys + + # distutils is breaking our sdists for files in symlinked dirs.