diff --git a/matplotlib-setup.cfg b/matplotlib-setup.cfg index 0c28ea7..c3f54f8 100644 --- a/matplotlib-setup.cfg +++ b/matplotlib-setup.cfg @@ -77,7 +77,7 @@ gtkagg = True pyside = Auto qt4agg = Auto tkagg = True -wxagg = True +wxagg = Auto macosx = False windowing = False diff --git a/python-matplotlib.changes b/python-matplotlib.changes index edb0196..0bb4717 100644 --- a/python-matplotlib.changes +++ b/python-matplotlib.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jul 1 12:26:33 UTC 2015 - toddrme2178@gmail.com + +- Disable qt5 on SLE 12 +- Disable wx on SLE 11 and 12 +- Disable latex and gtk3 on SLE 11 +- Don't require texlive-sfmath on SLE 12 +- Disable qt5 on ppc and arm +- Depend on libxml2 instead of libxml2-tools + ------------------------------------------------------------------- Thu May 21 15:01:06 UTC 2015 - toddrme2178@gmail.com diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 3252467..b20a624 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -35,7 +35,7 @@ BuildRequires: freetype2-devel >= 2.3 BuildRequires: gcc-c++ BuildRequires: ghostscript BuildRequires: libpng-devel >= 1.2 -BuildRequires: libxml2-tools +BuildRequires: libxml2 BuildRequires: pkg-config BuildRequires: poppler-tools BuildRequires: python-CXX-devel >= 6.2.4 @@ -57,26 +57,36 @@ BuildRequires: python-cairocffi # GTK dependencies BuildRequires: gtk2-devel BuildRequires: libgnome-devel +%if 0%{?suse_version} != 1110 BuildRequires: python-gobject BuildRequires: python-gobject-devel +%endif BuildRequires: python-gobject2 BuildRequires: python-gobject2-devel BuildRequires: python-gtk >= 2.2.0 BuildRequires: python-gtk-devel >= 2.2.0 +%if 0%{?suse_version} != 1110 # latex dependencies BuildRequires: texlive-dvipng BuildRequires: texlive-latex -BuildRequires: texlive-sfmath BuildRequires: texlive-tex +%if 0%{?suse_version} != 1315 +BuildRequires: texlive-sfmath +%endif +%endif # Qt4 dependencies +%if 0%{?suse_version} != 1110 BuildRequires: python-pyside +%endif BuildRequires: python-qt4 BuildRequires: python-qt4-devel +%ifarch %{ix86} x86_64 +%if 0%{?suse_version} > 1315 # Qt5 dependencies -%if 0%{?suse_version} > 1310 BuildRequires: python-qt5 BuildRequires: python-qt5-devel %endif +%endif # tk dependencies BuildRequires: python-tk BuildRequires: tcl @@ -85,11 +95,13 @@ BuildRequires: tk BuildRequires: tk-devel # WebAgg dependencies BuildRequires: python-tornado +%if 0%{?suse_version} != 1315 && 0%{?suse_version} != 1110 # Wx dependencies BuildRequires: python-wxWidgets >= 2.8 BuildRequires: wxWidgets-devel %define _use_internal_dependency_generator 0 %define __find_requires %wx_requires +%endif Requires: python-dateutil >= 1.1 Requires: python-numpy >= 1.6 Requires: python-pyparsing >= 1.5.6 @@ -319,17 +331,20 @@ install -vm 755 %{SOURCE3} %{buildroot}%{python_sitearch}/ %{python_sitearch}/matplotlib/backends/backend_gtkcairo.* %{python_sitearch}/mpl_toolkits/gtktools.* +%if 0%{?suse_version} != 1110 %files gtk3 %defattr(-,root,root,-) %{python_sitearch}/matplotlib/backends/backend_gtk3.* %{python_sitearch}/matplotlib/backends/backend_gtk3agg.* %{python_sitearch}/matplotlib/backends/backend_gtk3cairo.* +%endif +%if 0%{?suse_version} != 1110 # Dummy package to pull in latex dependencies. - %files latex %defattr(-,root,root,-) %doc doc/users/usetex.rst +%endif # IMPORTANT: the qt4 backend makes use of the qt5 backend, # which is actually a generic qt backend. @@ -359,7 +374,8 @@ install -vm 755 %{SOURCE3} %{buildroot}%{python_sitearch}/ %{_libdir}/qt4/plugins/designer/python/matplotlibplugin.py %{python_sitearch}/matplotlibwidget.py -%if 0%{?suse_version} > 1310 +%ifarch %{ix86} x86_64 +%if 0%{?suse_version} > 1315 %files qt5 %defattr(-,root,root,-) # IMPORTANT: the qt4 backend makes use of the qt5 backend, @@ -369,6 +385,7 @@ install -vm 755 %{SOURCE3} %{buildroot}%{python_sitearch}/ # python-qt5 dependency. %doc README.rst %endif +%endif %files tk %defattr(-,root,root,-) @@ -382,9 +399,11 @@ install -vm 755 %{SOURCE3} %{buildroot}%{python_sitearch}/ %{python_sitearch}/matplotlib/backends/backend_webagg_core.* %{python_sitearch}/matplotlib/backends/web_backend/ +%if 0%{?suse_version} != 1315 && 0%{?suse_version} != 1110 %files wx %defattr(-,root,root,-) %{python_sitearch}/matplotlib/backends/backend_wx.* %{python_sitearch}/matplotlib/backends/backend_wxagg.* +%endif %changelog