Hello community,
here is the log from the commit of package python3-matplotlib for
openSUSE:Factory checked in at 2014-09-18 07:12:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-matplotlib (Old)
and /work/SRC/openSUSE:Factory/.python3-matplotlib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-matplotlib"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-matplotlib/python3-matplotlib.changes
2014-09-03 20:59:53.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python3-matplotlib.new/python3-matplotlib.changes
2014-09-18 07:12:55.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Sep 11 08:53:11 UTC 2014 - toddrme2...@gmail.com
+
+- Add new python-cairocffi dependency. This is the recommended
+ dependency for the cairo backend upstream.
+- Split out the cairo backend into its own subpackage. It is no
+ longer tied to gtk, so people can use it on its own without
+ pulling in any gtk dependencies.
+
+-------------------------------------------------------------------
+Wed Sep 10 10:52:03 UTC 2014 - toddrme2...@gmail.com
+
+- Dependency and spec file cleanups
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-matplotlib.spec ++++++
--- /var/tmp/diff_new_pack.hOMtJU/_old 2014-09-18 07:12:57.000000000 +0200
+++ /var/tmp/diff_new_pack.hOMtJU/_new 2014-09-18 07:12:57.000000000 +0200
@@ -25,68 +25,81 @@
Url: http://sourceforge.net/projects/matplotlib
Source: matplotlib-%{version}.tar.gz
Source1: matplotlib-setup.cfg
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: agg-devel
BuildRequires: fdupes
BuildRequires: fltk-devel
-BuildRequires: freetype2-devel
+BuildRequires: freetype2-devel >= 2.3
BuildRequires: gcc-c++
BuildRequires: ghostscript
-BuildRequires: gtk2-devel
-BuildRequires: libgnome-devel
-BuildRequires: libpng-devel
+BuildRequires: libpng-devel >= 1.2
BuildRequires: libxml2-tools
+BuildRequires: pkg-config
BuildRequires: poppler-tools
-BuildRequires: python3-cairo
-BuildRequires: python3-cairo-devel
-BuildRequires: python3-dateutil
+BuildRequires: python3-CXX-devel >= 6.2.4
+BuildRequires: python3-Pillow
+BuildRequires: python3-dateutil >= 1.1
BuildRequires: python3-devel
-BuildRequires: python3-CXX
+BuildRequires: python3-numpy-devel >= 1.6
+BuildRequires: python3-pyparsing >= 1.5.6
+BuildRequires: python3-pytz
+BuildRequires: python3-setuptools
+BuildRequires: python3-six >= 1.3
+BuildRequires: qhull-devel >= 2003.1
+# needed for testing
+BuildRequires: python3-mock
+BuildRequires: python3-nose
+# cairo dependencies
+BuildRequires: python3-cairocffi
+# GTK dependencies
+BuildRequires: gtk2-devel
+BuildRequires: libgnome-devel
BuildRequires: python3-gobject
-BuildRequires: python3-gobject-cairo
BuildRequires: python3-gobject-devel
BuildRequires: python3-gobject2
BuildRequires: python3-gobject2-devel
-BuildRequires: python3-numpy-devel >= 1.2.1
-%if 0%{?suse_version} > 1220
+# latex dependencies
+BuildRequires: texlive-dvipng
+BuildRequires: texlive-latex
+BuildRequires: texlive-sfmath
+BuildRequires: texlive-tex
+# Qt4 dependencies
+# BuildRequires: python3-pyside
BuildRequires: python3-qt4
BuildRequires: python3-qt4-devel
-%endif
+# Qt5 dependencies
%if 0%{?suse_version} > 1310
BuildRequires: python3-qt5
BuildRequires: python3-qt5-devel
%endif
-BuildRequires: python3-pyparsing
-# BuildRequires: python3-pyside
-BuildRequires: python3-setuptools
+# tk dependencies
BuildRequires: python3-tk
-BuildRequires: python3-tornado
-BuildRequires: python3-tz
-# BuildRequires: python3-wxWidgets
BuildRequires: tcl
BuildRequires: tcl-devel
-BuildRequires: texlive-latex
-%if 0%{?suse_version} > 1220
-BuildRequires: texlive-dvipng
-BuildRequires: texlive-sfmath
-BuildRequires: texlive-tex
-%endif
BuildRequires: tk
BuildRequires: tk-devel
-# needed for testing
-BuildRequires: python3-nose
-Requires: python3-dateutil
-Requires: python3-numpy >= 1.2.1
-Requires: python3-pyparsing
+# WebAgg dependencies
+BuildRequires: python3-tornado
+# Wx Dependencies
+# BuildRequires: python3-wxWidgets
+# BuildRequires: wxWidgets-devel
+# %%define _use_internal_dependency_generator 0
+# %%define __find_requires %%wx_requires
+Requires: python3-dateutil >= 1.1
+Requires: python3-numpy >= 1.6
+Requires: python3-pyparsing >= 1.5.6
Requires: python3-pytz
+Requires: python3-six >= 1.3
Recommends: ghostscript
Recommends: inkscape
Recommends: libxml2-tools
+Recommends: python-Pillow
Recommends: poppler-tools
+Recommends: python-matplotlib-tk
Recommends: texlive-dvipng
Recommends: texlive-latex
Recommends: texlive-sfmath
Recommends: texlive-tex
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
matplotlib is a python 2D plotting library which produces publication
@@ -95,11 +108,23 @@
scripts, the python and ipython shell (ala matlab or mathematica), web
application servers, and six graphical user interface toolkits.
+%package cairo
+Summary: Cairo backend for %{name}
+License: SUSE-Matplotlib
+Group: Development/Libraries/Python
+Requires: %{name} = %{version}
+Requires: python3-cairocffi
+
+%description cairo
+This package includes the non-interactive Cairo-based backend
+for the %{name} plotting package
+
%package gtk2
Summary: GTK2 backends for %{name}
License: BSD-2-Clause
Group: Development/Libraries/Python
Requires: %{name} = %{version}
+Requires: %{name}-cairo = %{version}
Requires: python3-gobject2
%description gtk2
@@ -111,9 +136,8 @@
License: BSD-2-Clause
Group: Development/Libraries/Python
Requires: %{name} = %{version}
-Requires: python3-cairo
+Requires: %{name}-cairo = %{version}
Requires: python3-gobject
-Requires: python3-gobject-cairo
%description gtk3
This package includes the GTK3-based gtk3, gtk3agg, and
@@ -126,12 +150,12 @@
Requires: %{name} = %{version}
%description qt-shared
-This package includes files needed by both the Qt4-based pyqt4
-backend and the Qt5-based pyqt5 backend for the %{name}
+This package includes files needed by both the Qt4-based pyqt4 and
+pyside backends and the Qt5-based pyqt5 backend for the %{name}
plotting package
%package qt4
-Summary: Qt4 backend for %{name}
+Summary: Qt4 backends for %{name}
License: BSD-2-Clause
Group: Development/Libraries/Python
Requires: %{name} = %{version}
@@ -174,6 +198,7 @@
Group: Development/Libraries/Python
Requires: %{name} = %{version}
Requires: python3-tk
+Requires: tcl >= 8.3
%description tk
This package includes the Tk-based tkagg backend
@@ -203,6 +228,7 @@
%prep
%setup -q -n matplotlib-%{version}
+chmod -x lib/matplotlib/mpl-data/images/*.svg
find examples lib/matplotlib lib/mpl_toolkits/mplot3d -type f -name "*.py"
-exec sed -i "s|#!\/usr\/bin\/env python||" {} \;
%build
@@ -219,8 +245,6 @@
python3 setup.py install --root=%{buildroot} --prefix=%{_prefix}
%fdupes %{buildroot}%{python3_sitearch}
-%fdupes %{buildroot}%{py_sitedir}/matplotlib/tests/baseline_images/
-
%files
%defattr(-,root,root,-)
%doc README.rst LICENSE CHANGELOG PKG-INFO examples doc/users/license.rst
@@ -255,21 +279,23 @@
%exclude %{python3_sitearch}/matplotlib/backends/qt_compat.*
%exclude %{python3_sitearch}/matplotlib/backends/qt4_compat.*
%exclude %{python3_sitearch}/matplotlib/backends/tkagg.*
-%exclude %{python3_sitearch}/matplotlib/backends/windowing.*
%exclude %{python3_sitearch}/matplotlib/backends/qt_editor/
%exclude %{python3_sitearch}/matplotlib/backends/web_backend/
-%exclude %{python3_sitearch}/mpl_toolkits/gtktools.py*
+%exclude %{python3_sitearch}/mpl_toolkits/gtktools.*
+
+%files cairo
+%defattr(-,root,root,-)
+%{python3_sitearch}/matplotlib/backends/backend_cairo.*
%files gtk2
%defattr(-,root,root,-)
# %{python3_sitearch}/matplotlib/backends/_backend_gdk.so
# %{python3_sitearch}/matplotlib/backends/_gtkagg.so
-%{python3_sitearch}/matplotlib/backends/backend_cairo.*
%{python3_sitearch}/matplotlib/backends/backend_gdk.*
%{python3_sitearch}/matplotlib/backends/backend_gtk.*
%{python3_sitearch}/matplotlib/backends/backend_gtkagg.*
%{python3_sitearch}/matplotlib/backends/backend_gtkcairo.*
-%{python3_sitearch}/mpl_toolkits/gtktools.py*
+%{python3_sitearch}/mpl_toolkits/gtktools.*
%files gtk3
%defattr(-,root,root,-)
@@ -277,13 +303,14 @@
%{python3_sitearch}/matplotlib/backends/backend_gtk3agg.*
%{python3_sitearch}/matplotlib/backends/backend_gtk3cairo.*
-%if 0%{?suse_version} > 1220
-%files qt-shared
# IMPORTANT: the qt4 backend makes use of the qt5 backend,
# which is actually a generic qt backend.
# So we need to package all the qt5 stuff in this generic
# package, and provide a stub package which pulls in the
# python-qt5 dependency.
+
+%files qt-shared
+%defattr(-,root,root,-)
%{python3_sitearch}/matplotlib/backends/backend_qt5.*
%{python3_sitearch}/matplotlib/backends/backend_qt5agg.*
%{python3_sitearch}/matplotlib/backends/qt_compat.*
@@ -305,7 +332,6 @@
# python-qt5 dependency.
%doc README.rst
%endif
-%endif
%files tk
%defattr(-,root,root,-)
@@ -324,5 +350,4 @@
# %{python3_sitearch}/matplotlib/backends/backend_wx.*
# %{python3_sitearch}/matplotlib/backends/backend_wxagg.*
-
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
