forked from pool/python-matplotlib
		
	- Remove the is_opensuse literals as we don't want to have matplotlib
behave differently between openSUSE and SLE jsc#SLE-11752 - Remove the qt4 code support as we do just Qt5 everywhere OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-matplotlib?expand=0&rev=27
This commit is contained in:
		
				
					committed by
					
						 Git OBS Bridge
						Git OBS Bridge
					
				
			
			
				
	
			
			
			
						parent
						
							a1b6a211dc
						
					
				
				
					commit
					1def2f9b9e
				
			| @@ -1,3 +1,14 @@ | ||||
| ------------------------------------------------------------------- | ||||
| Mon May 18 06:56:24 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com> | ||||
|  | ||||
| - Remove the is_opensuse literals as we don't want to have matplotlib | ||||
|   behave differently between openSUSE and SLE jsc#SLE-11752 | ||||
|  | ||||
| ------------------------------------------------------------------- | ||||
| Fri May 15 09:03:43 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com> | ||||
|  | ||||
| - Remove the qt4 code support as we do just Qt5 everywhere | ||||
|  | ||||
| ------------------------------------------------------------------- | ||||
| Sat Mar 28 16:40:20 UTC 2020 - Arun Persaud <arun@gmx.de> | ||||
|  | ||||
|   | ||||
| @@ -19,12 +19,6 @@ | ||||
| %{?!python_module:%define python_module() python-%{**} python3-%{**}} | ||||
| %define         oldpython python | ||||
| %define         skip_python2 1 | ||||
| # No Qt4 plugin on > Leap 15.1 | ||||
| %if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150100 | ||||
| %bcond_with qt4 | ||||
| %else | ||||
| %bcond_without qt4 | ||||
| %endif | ||||
| # Not doing tests because they take too long | ||||
| # The tests also pull in dependencies of all backends done in pure python | ||||
| %bcond_with tests | ||||
| @@ -33,7 +27,6 @@ Version:        3.2.1 | ||||
| Release:        0 | ||||
| Summary:        Plotting Library for Python | ||||
| License:        SUSE-Matplotlib | ||||
| Group:          Development/Libraries/Python | ||||
| URL:            https://matplotlib.org | ||||
| Source:         https://files.pythonhosted.org/packages/source/m/matplotlib/matplotlib-%{version}.tar.gz | ||||
| Source1:        matplotlib-setup.cfg | ||||
| @@ -50,6 +43,7 @@ BuildRequires:  c++_compiler | ||||
| BuildRequires:  fdupes | ||||
| BuildRequires:  pkgconfig | ||||
| BuildRequires:  python-rpm-macros | ||||
| BuildRequires:  qhull-devel >= 2003.1 | ||||
| Requires:       python-Cycler >= 0.10 | ||||
| Requires:       python-kiwisolver >= 1.0.1 | ||||
| Requires:       python-numpy >= 1.7.1 | ||||
| @@ -63,9 +57,6 @@ Recommends:     poppler-tools | ||||
| Recommends:     python-Pillow | ||||
| Provides:       python-matplotlib-gtk = %{version} | ||||
| Obsoletes:      python-matplotlib-gtk < %{version} | ||||
| %if 0%{?is_opensuse} | ||||
| BuildRequires:  qhull-devel >= 2003.1 | ||||
| %endif | ||||
| # SECTION WebAgg dependencies | ||||
| BuildRequires:  %{python_module tornado} | ||||
| # /SECTION | ||||
| @@ -103,9 +94,8 @@ BuildRequires:  inkscape | ||||
| BuildRequires:  poppler-tools | ||||
| BuildRequires:  texlive-dvipng | ||||
| BuildRequires:  texlive-latex | ||||
| BuildRequires:  texlive-tex | ||||
| %if 0%{?is_opensuse} | ||||
| BuildRequires:  texlive-sfmath | ||||
| BuildRequires:  texlive-tex | ||||
| BuildRequires:  tex(8a.enc) | ||||
| BuildRequires:  tex(helvet.sty) | ||||
| BuildRequires:  tex(phvr7t.tfm) | ||||
| @@ -113,12 +103,6 @@ BuildRequires:  tex(pncr7t.tfm) | ||||
| BuildRequires:  tex(psfrag.sty) | ||||
| BuildRequires:  tex(type1cm.sty) | ||||
| BuildRequires:  tex(ucs.sty) | ||||
| %endif | ||||
| # /SECTION | ||||
| # SECTION Qt4 dependencies | ||||
| %if %{with qt4} | ||||
| BuildRequires:  %{python_module qt4} | ||||
| %endif | ||||
| # /SECTION | ||||
| %endif | ||||
| %if 0%{?suse_version} >= 1500 | ||||
| @@ -138,7 +122,6 @@ 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:       python-cairo | ||||
|  | ||||
| @@ -149,7 +132,6 @@ for the %{name} plotting package | ||||
| %package        gtk3 | ||||
| Summary:        GTK3 backends for %{name} | ||||
| License:        BSD-2-Clause | ||||
| Group:          Development/Libraries/Python | ||||
| Requires:       %{name} = %{version} | ||||
| Requires:       %{name}-cairo = %{version} | ||||
| Requires:       python-gobject | ||||
| @@ -161,49 +143,23 @@ gtk3cairo backends for the %{name} plotting package | ||||
| %package        latex | ||||
| Summary:        Allow rendering latex in %{name} | ||||
| License:        BSD-2-Clause | ||||
| Group:          Development/Libraries/Python | ||||
| Requires:       %{name} = %{version} | ||||
| Requires:       texlive-dvipng | ||||
| Requires:       texlive-latex | ||||
| Requires:       texlive-tex | ||||
| %if 0%{?is_opensuse} | ||||
| Requires:       texlive-sfmath | ||||
| %endif | ||||
| Requires:       texlive-tex | ||||
|  | ||||
| %description    latex | ||||
| This package allows %{name} to display latex in plots | ||||
| and figures. | ||||
|  | ||||
| %package        qt-shared | ||||
| Summary:        Shared files for the Qt backends for %{name} | ||||
| License:        BSD-2-Clause | ||||
| Group:          Development/Libraries/Python | ||||
| Requires:       %{name} = %{version} | ||||
|  | ||||
| %description    qt-shared | ||||
| 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 backends for %{name} | ||||
| License:        BSD-2-Clause | ||||
| Group:          Development/Libraries/Python | ||||
| Requires:       %{name} = %{version} | ||||
| Requires:       %{name}-qt-shared = %{version} | ||||
| Requires:       python-qt4 >= 4.0 | ||||
|  | ||||
| %description    qt4 | ||||
| This package includes the Qt4-based pyqt4 and pyside backends | ||||
| for the %{name} plotting package | ||||
|  | ||||
| %package        qt5 | ||||
| Summary:        Qt5 backend for %{name} | ||||
| License:        BSD-2-Clause | ||||
| Group:          Development/Libraries/Python | ||||
| Requires:       %{name} = %{version} | ||||
| Requires:       %{name}-qt-shared = %{version} | ||||
| Requires:       python-qt5 | ||||
| Provides:       %{name}-qt-shared = %{version} | ||||
| Obsoletes:      %{name}-qt-shared | ||||
|  | ||||
| %description    qt5 | ||||
| This package includes the Qt5-based pyqt5 backend | ||||
| @@ -212,7 +168,6 @@ for the %{name} plotting package | ||||
| %package        tk | ||||
| Summary:        Tk backend for %{name} | ||||
| License:        BSD-2-Clause | ||||
| Group:          Development/Libraries/Python | ||||
| Requires:       %{name} = %{version} | ||||
| Requires:       python-tk | ||||
| Requires:       tcl >= 8.3 | ||||
| @@ -224,7 +179,6 @@ for the %{name} plotting package | ||||
| %package        web | ||||
| Summary:        Web backend for %{name} | ||||
| License:        BSD-2-Clause | ||||
| Group:          Development/Libraries/Python | ||||
| Requires:       %{name} = %{version} | ||||
| Requires:       python-tornado | ||||
|  | ||||
| @@ -235,7 +189,6 @@ for the %{name} plotting package | ||||
| %package        wx | ||||
| Summary:        WxWidgets backend for %{name} | ||||
| License:        BSD-2-Clause | ||||
| Group:          Development/Libraries/Python | ||||
| Requires:       %{name} = %{version} | ||||
| Requires:       python-wxPython >= 4 | ||||
|  | ||||
| @@ -293,7 +246,6 @@ trap "kill $! || true" EXIT | ||||
| %{python_sitearch}/mpl_toolkits | ||||
| %{python_sitearch}/pylab.py* | ||||
| %pycache_only %{python_sitearch}/__pycache__/pylab.* | ||||
| %if 0%{?is_opensuse} | ||||
| %exclude %{python_sitearch}/matplotlib/backends/backend_cairo.* | ||||
| %exclude %{python_sitearch}/matplotlib/backends/backend_gtk3.* | ||||
| %exclude %{python_sitearch}/matplotlib/backends/backend_gtk3agg.* | ||||
| @@ -312,9 +264,7 @@ trap "kill $! || true" EXIT | ||||
| %exclude %{python_sitearch}/matplotlib/backends/tkagg.* | ||||
| %exclude %{python_sitearch}/matplotlib/backends/web_backend/ | ||||
| %exclude %{python_sitearch}/matplotlib/backends/wx_compat.* | ||||
| %endif | ||||
| %ifpycache | ||||
| %if 0%{?is_opensuse} | ||||
| %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_cairo.*.py* | ||||
| %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3.*.py* | ||||
| %exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3agg.*.py* | ||||
| @@ -332,14 +282,12 @@ trap "kill $! || true" EXIT | ||||
| %exclude %{python_sitearch}/matplotlib/backends/__pycache__/tkagg.*.py* | ||||
| %exclude %{python_sitearch}/matplotlib/backends/__pycache__/wx_compat.*.py* | ||||
| %endif | ||||
| %endif | ||||
|  | ||||
| # Dummy package to pull in latex dependencies. | ||||
| %files %{python_files latex} | ||||
| %license LICENSE/ | ||||
| %license doc/users/license.rst | ||||
|  | ||||
| %if 0%{?is_opensuse} | ||||
| %files %{python_files cairo} | ||||
| %license LICENSE/ | ||||
| %license doc/users/license.rst | ||||
| @@ -356,12 +304,7 @@ trap "kill $! || true" EXIT | ||||
| %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3agg.*.py* | ||||
| %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3cairo.*.py* | ||||
|  | ||||
| # 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 a generic | ||||
| # package, and provide the -qt5 stub package which pulls in | ||||
| # the python-qt5 dependency. | ||||
| %files %{python_files qt-shared} | ||||
| %files %{python_files qt5} | ||||
| %license LICENSE/ | ||||
| %license doc/users/license.rst | ||||
| %{python_sitearch}/matplotlib/backends/backend_qt5.py* | ||||
| @@ -372,21 +315,6 @@ trap "kill $! || true" EXIT | ||||
| %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*.py* | ||||
| %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/qt_compat.*.py* | ||||
|  | ||||
| %if %{with qt4} | ||||
| %files %{python_files qt4} | ||||
| %license LICENSE/ | ||||
| %license doc/users/license.rst | ||||
| %{python_sitearch}/matplotlib/backends/backend_qt4.py* | ||||
| %{python_sitearch}/matplotlib/backends/backend_qt4agg.py* | ||||
| %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt4.*.py* | ||||
| %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*.py* | ||||
| %endif | ||||
|  | ||||
| %files %{python_files qt5} | ||||
| %license LICENSE/ | ||||
| %license doc/users/license.rst | ||||
| %doc README.rst | ||||
|  | ||||
| %files %{python_files tk} | ||||
| %license LICENSE/ | ||||
| %license doc/users/license.rst | ||||
| @@ -410,6 +338,4 @@ trap "kill $! || true" EXIT | ||||
| %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_wx.*.py* | ||||
| %pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_wxagg.*.py* | ||||
|  | ||||
| %endif | ||||
|  | ||||
| %changelog | ||||
|   | ||||
		Reference in New Issue
	
	Block a user