From cd6d6fe8fe041813f8f564f0100e541aadeb4a13b4f61d695791ff55932a2a8c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 11 May 2018 07:18:53 +0000 Subject: [PATCH] Accepting request 606286 from devel:languages:python OBS-URL: https://build.opensuse.org/request/show/606286 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-matplotlib?expand=0&rev=61 --- python-matplotlib.changes | 5 +++++ python-matplotlib.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/python-matplotlib.changes b/python-matplotlib.changes index 3d4bbb8..a78909c 100644 --- a/python-matplotlib.changes +++ b/python-matplotlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 10 22:27:45 UTC 2018 - toddrme2178@gmail.com + +- Fix building on SLE which doesn't have qhull. + ------------------------------------------------------------------- Sat Mar 17 19:29:36 UTC 2018 - arun@gmx.de diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 56f2762..4ff96c6 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -35,7 +35,6 @@ BuildRequires: c++_compiler BuildRequires: fdupes BuildRequires: pkg-config BuildRequires: python-rpm-macros -BuildRequires: qhull-devel >= 2003.1 BuildRequires: pkgconfig(freetype2) >= 2.3 BuildRequires: pkgconfig(libpng) >= 1.2 # Python 2 only @@ -64,6 +63,7 @@ BuildRequires: texlive-dvipng BuildRequires: texlive-latex BuildRequires: texlive-tex %if 0%{?is_opensuse} +BuildRequires: qhull-devel >= 2003.1 BuildRequires: texlive-sfmath BuildRequires: tex(8a.enc) BuildRequires: tex(helvet.sty) @@ -301,7 +301,9 @@ trap "kill $! || true" EXIT %exclude %{python_sitearch}/matplotlib/backends/qt_editor/ %exclude %{python_sitearch}/matplotlib/backends/tkagg.* %exclude %{python_sitearch}/matplotlib/backends/web_backend/ +%endif %ifpycache +%if 0%{?is_opensuse} %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_cairo.* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3.* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3agg.* @@ -316,7 +318,9 @@ trap "kill $! || true" EXIT %exclude %{python_sitearch}/matplotlib/backends/__pycache__/qt_compat.* %exclude %{python_sitearch}/matplotlib/backends/__pycache__/tkagg.* %endif +%endif %ifpython2 +%if 0%{?is_opensuse} %exclude %{python_sitearch}/matplotlib/backends/backend_wx.py* %exclude %{python_sitearch}/matplotlib/backends/backend_wxagg.py* %exclude %{python_sitearch}/matplotlib/backends/wx_compat.py*