From 6440e489b026869da25475b8f1f1c9f64356f21e Mon Sep 17 00:00:00 2001 From: Raphael Groner Date: Feb 23 2019 14:02:09 +0000 Subject: [PATCH 1/3] prepare python3 for epel --- diff --git a/python-matplotlib.spec b/python-matplotlib.spec index 1622f62..b27f116 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -1,3 +1,13 @@ +# workaround to build srpm for epel but on fedora +%if 0%{?fedora} +%global python3_other_pkgversion 3 +%else +%if 0%{?python3_other_pkgversion} +# FIXME needed? +%global python3_other_pkgversion 36 +%endif +%endif + %global with_html 0 # It seems like there's some kind of weird occasional error where a @@ -6,7 +16,9 @@ # you won't get the same error. Unless someone can figure out what's # going on, we just have to keep re-running the build until it doesn't # happen. +%if 0%{?fedora} %global run_tests 1 +%endif # the default backend; one of GTK3Agg GTK3Cairo MacOSX Qt4Agg Qt5Agg TkAgg # WXAgg Agg Cairo PS PDF SVG @@ -44,7 +56,7 @@ Name: python-matplotlib Version: 3.0.2 -Release: 1%{?rctag:.%{rctag}}%{?dist}.1 +Release: 1%{?rctag:.%{rctag}}%{?dist}.2 Summary: Python 2D plotting library # qt4_editor backend is MIT License: Python and MIT @@ -93,70 +105,72 @@ Matplotlib tries to make easy things easy and hard things possible. You can generate plots, histograms, power spectra, bar charts, errorcharts, scatterplots, etc, with just a few lines of code. -%package -n python3-matplotlib-data +%package -n python%{python3_other_pkgversion}-matplotlib-data Summary: Data used by python-matplotlib BuildArch: noarch %if %{with_bundled_fonts} -Requires: python3-matplotlib-data-fonts = %{version}-%{release} +Requires: python%{python3_other_pkgversion}-matplotlib-data-fonts = %{version}-%{release} %endif Obsoletes: python-matplotlib-data < 2.2.3-2 -%{?python_provide:%python_provide python3-matplotlib-data} +%{?python_provide:%python_provide python%{python3_other_pkgversion}-matplotlib-data} -%description -n python3-matplotlib-data +%description -n python%{python3_other_pkgversion}-matplotlib-data %{summary} %if %{with_bundled_fonts} -%package -n python3-matplotlib-data-fonts +%package -n python%{python3_other_pkgversion}-matplotlib-data-fonts Summary: Fonts used by python-matplotlib # STIX and Computer Modern is OFL # DejaVu is Bitstream Vera and Public Domain License: OFL and Bitstream Vera and Public Domain BuildArch: noarch -Requires: python3-matplotlib-data = %{version}-%{release} +Requires: python%{python3_other_pkgversion}-matplotlib-data = %{version}-%{release} Obsoletes: python-matplotlib-data-fonts < 2.2.3-2 -%{?python_provide:%python_provide python3-matplotlib-data-fonts} +%{?python_provide:%python_provide python%{python3_other_pkgversion}-matplotlib-data-fonts} -%description -n python3-matplotlib-data-fonts +%description -n python%{python3_other_pkgversion}-matplotlib-data-fonts %{summary} %endif -%package -n python3-matplotlib +%package -n python%{python3_other_pkgversion}-matplotlib Summary: Python 2D plotting library -BuildRequires: python3-cairo -BuildRequires: python3-cycler >= 0.10.0 -BuildRequires: python3-dateutil -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-gobject -BuildRequires: python3-kiwisolver -BuildRequires: python3-numpy -BuildRequires: python3-pillow -BuildRequires: python3-pyparsing -BuildRequires: python3-pytz -BuildRequires: python3-sphinx +BuildRequires: python%{python3_other_pkgversion}-cairo +#BuildRequires: python%{python3_other_pkgversion}-cycler >= 0.10.0 +BuildRequires: python%{python3_other_pkgversion}-dateutil +BuildRequires: python%{python3_other_pkgversion}-devel +BuildRequires: python%{python3_other_pkgversion}-setuptools +BuildRequires: python%{python3_other_pkgversion}-gobject +#BuildRequires: python%{python3_other_pkgversion}-kiwisolver +BuildRequires: python%{python3_other_pkgversion}-numpy +#BuildRequires: python%{python3_other_pkgversion}-pillow +#BuildRequires: python%{python3_other_pkgversion}-pyparsing +BuildRequires: python%{python3_other_pkgversion}-pytz +BuildRequires: python%{python3_other_pkgversion}-sphinx Requires: dejavu-sans-fonts Requires: dvipng -Requires: python3-matplotlib-data = %{version}-%{release} -Requires: python3-cairo -Requires: python3-cycler >= 0.10.0 -Requires: python3-dateutil -Requires: python3-kiwisolver -Requires: python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release} -%if %{run_tests} -BuildRequires: python3-pytest -BuildRequires: python3-pytest-xdist +Requires: python%{python3_other_pkgversion}-matplotlib-data = %{version}-%{release} +Requires: python%{python3_other_pkgversion}-cairo +#Requires: python%{python3_other_pkgversion}-cycler >= 0.10.0 +Requires: python%{python3_other_pkgversion}-dateutil +#Requires: python%{python3_other_pkgversion}-kiwisolver +Requires: python%{python3_other_pkgversion}-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release} +%if 0%{?run_tests} +BuildRequires: python%{python3_other_pkgversion}-pytest +BuildRequires: python%{python3_other_pkgversion}-pytest-xdist %endif -Requires: python3-numpy -Recommends: python3-pillow -Requires: python3-pyparsing +Requires: python%{python3_other_pkgversion}-numpy +%if 0%{?fedora} +Recommends: python%{python3_other_pkgversion}-pillow +%endif +Requires: python%{python3_other_pkgversion}-pyparsing %if !%{with_bundled_fonts} Requires: stix-math-fonts %else Provides: bundled(stix-math-fonts) %endif -%{?python_provide:%python_provide python3-matplotlib} +%{?python_provide:%python_provide python%{python3_other_pkgversion}-matplotlib} -%description -n python3-matplotlib +%description -n python%{python3_other_pkgversion}-matplotlib Matplotlib is a python 2D plotting library which produces publication quality figures in a variety of hardcopy formats and interactive environments across platforms. matplotlib can be used in python @@ -167,81 +181,81 @@ Matplotlib tries to make easy things easy and hard things possible. You can generate plots, histograms, power spectra, bar charts, errorcharts, scatterplots, etc, with just a few lines of code. -%package -n python3-matplotlib-qt4 -Summary: Qt4 backend for python3-matplotlib -BuildRequires: python3-PyQt4-devel -Requires: python3-matplotlib%{?_isa} = %{version}-%{release} -Requires: python3-matplotlib-qt5 -Requires: python3-PyQt4 -%{?python_provide:%python_provide python3-matplotlib-qt4} +%package -n python%{python3_other_pkgversion}-matplotlib-qt4 +Summary: Qt4 backend for python%{python3_other_pkgversion}-matplotlib +#BuildRequires: python%{python3_other_pkgversion}-PyQt4-devel +Requires: python%{python3_other_pkgversion}-matplotlib%{?_isa} = %{version}-%{release} +#Requires: python%{python3_other_pkgversion}-matplotlib-qt5 +Requires: python%{python3_other_pkgversion}-PyQt4 +%{?python_provide:%python_provide python%{python3_other_pkgversion}-matplotlib-qt4} -%description -n python3-matplotlib-qt4 +%description -n python%{python3_other_pkgversion}-matplotlib-qt4 %{summary} -%package -n python3-matplotlib-qt5 -Summary: Qt5 backend for python3-matplotlib -BuildRequires: python3-qt5 -Requires: python3-matplotlib%{?_isa} = %{version}-%{release} -Requires: python3-qt5 -%{?python_provide:%python_provide python3-matplotlib-qt5} +%package -n python%{python3_other_pkgversion}-matplotlib-qt5 +Summary: Qt5 backend for python%{python3_other_pkgversion}-matplotlib +#BuildRequires: python%{python3_other_pkgversion}-qt5 +Requires: python%{python3_other_pkgversion}-matplotlib%{?_isa} = %{version}-%{release} +#Requires: python%{python3_other_pkgversion}-qt5 +%{?python_provide:%python_provide python%{python3_other_pkgversion}-matplotlib-qt5} -%description -n python3-matplotlib-qt5 +%description -n python%{python3_other_pkgversion}-matplotlib-qt5 %{summary} -%package -n python3-matplotlib-gtk3 -Summary: GTK3 backend for python3-matplotlib +%package -n python%{python3_other_pkgversion}-matplotlib-gtk3 +Summary: GTK3 backend for python%{python3_other_pkgversion}-matplotlib # This should be converted to typelib(Gtk) when supported BuildRequires: gtk3 -BuildRequires: python3-gobject +BuildRequires: python%{python3_other_pkgversion}-gobject Requires: gtk3%{?_isa} -Requires: python3-gobject%{?_isa} -Requires: python3-matplotlib%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python3-matplotlib-gtk3} +Requires: python%{python3_other_pkgversion}-gobject%{?_isa} +Requires: python%{python3_other_pkgversion}-matplotlib%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_other_pkgversion}-matplotlib-gtk3} -%description -n python3-matplotlib-gtk3 +%description -n python%{python3_other_pkgversion}-matplotlib-gtk3 %{summary} -%package -n python3-matplotlib-tk -Summary: Tk backend for python3-matplotlib -BuildRequires: python3-tkinter -Requires: python3-matplotlib%{?_isa} = %{version}-%{release} -Requires: python3-tkinter -%{?python_provide:%python_provide python3-matplotlib-tk} +%package -n python%{python3_other_pkgversion}-matplotlib-tk +Summary: Tk backend for python%{python3_other_pkgversion}-matplotlib +BuildRequires: python%{python3_other_pkgversion}-tkinter +Requires: python%{python3_other_pkgversion}-matplotlib%{?_isa} = %{version}-%{release} +Requires: python%{python3_other_pkgversion}-tkinter +%{?python_provide:%python_provide python%{python3_other_pkgversion}-matplotlib-tk} -%description -n python3-matplotlib-tk +%description -n python%{python3_other_pkgversion}-matplotlib-tk %{summary} -%package -n python3-matplotlib-wx -Summary: WX backend for python3-matplotlib -BuildRequires: python3-wxpython4 -Requires: python3-matplotlib%{?_isa} = %{version}-%{release} -Requires: python3-wxpython4 -%{?python_provide:%python_provide python3-matplotlib-wx} +%package -n python%{python3_other_pkgversion}-matplotlib-wx +Summary: WX backend for python%{python3_other_pkgversion}-matplotlib +#BuildRequires: python%{python3_other_pkgversion}-wxpython4 +Requires: python%{python3_other_pkgversion}-matplotlib%{?_isa} = %{version}-%{release} +#Requires: python%{python3_other_pkgversion}-wxpython4 +%{?python_provide:%python_provide python%{python3_other_pkgversion}-matplotlib-wx} -%description -n python3-matplotlib-wx +%description -n python%{python3_other_pkgversion}-matplotlib-wx %{summary} -%package -n python3-matplotlib-doc +%package -n python%{python3_other_pkgversion}-matplotlib-doc Summary: Documentation files for python-matplotlib %if %{with_html} BuildRequires: dvipng BuildRequires: graphviz -BuildRequires: python3-sphinx +BuildRequires: python%{python3_other_pkgversion}-sphinx BuildRequires: tex(latex) BuildRequires: tex-preview %endif -Requires: python3-matplotlib%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python3-matplotlib-doc} +Requires: python%{python3_other_pkgversion}-matplotlib%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_other_pkgversion}-matplotlib-doc} -%description -n python3-matplotlib-doc +%description -n python%{python3_other_pkgversion}-matplotlib-doc %{summary} -%package -n python3-matplotlib-test-data -Summary: Test data for python3-matplotlib -Requires: python3-matplotlib%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python3-matplotlib-test-data} +%package -n python%{python3_other_pkgversion}-matplotlib-test-data +Summary: Test data for python%{python3_other_pkgversion}-matplotlib +Requires: python%{python3_other_pkgversion}-matplotlib%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_other_pkgversion}-matplotlib-test-data} -%description -n python3-matplotlib-test-data +%description -n python%{python3_other_pkgversion}-matplotlib-test-data %{summary} @@ -277,7 +291,7 @@ if [ %{version} = 1.4.3 ]; then sed -i 's/\(__version__ = 200\)/\1.1/' lib/matplotlib/font_manager.py fi -%if !%{with_bundled_fonts} +%if 0%{?with_bundled_fonts} # Use fontconfig by default sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py %endif @@ -287,16 +301,18 @@ sed -i 's/\(USE_FONTCONFIG = \)False/\1True/' lib/matplotlib/font_manager.py %set_build_flags export http_proxy=http://127.0.0.1/ +%if 0%{?run_tests} MPLCONFIGDIR=$PWD \ MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \ - xvfb-run %{__python3} setup.py build -%if %{with_html} + xvfb-run %{__python3_other} setup.py build +%endif +%if 0%{?with_html} # Need to make built matplotlib libs available for the sphinx extensions: pushd doc MPLCONFIGDIR=$PWD/.. \ MATPLOTLIBDATA=$PWD/../lib/matplotlib/mpl-data \ PYTHONPATH=`realpath ../build/lib.linux*` \ - %{__python3} make.py html + %{__python3_other} make.py html popd %endif # Ensure all example files are non-executable so that the -doc @@ -308,18 +324,18 @@ export http_proxy=http://127.0.0.1/ MPLCONFIGDIR=$PWD \ MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data/ \ - %{__python3} setup.py install -O1 --skip-build --root=%{buildroot} -chmod +x %{buildroot}%{python3_sitearch}/matplotlib/dates.py + %{__python3_other} setup.py install -O1 --skip-build --root=%{buildroot} +chmod +x %{buildroot}%{python3_other_sitearch}/matplotlib/dates.py mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/matplotlib -mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data/matplotlibrc \ +mv %{buildroot}%{python3_other_sitearch}/matplotlib/mpl-data/matplotlibrc \ %{buildroot}%{_sysconfdir} -mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data \ +mv %{buildroot}%{python3_other_sitearch}/matplotlib/mpl-data \ %{buildroot}%{_datadir}/matplotlib %if !%{with_bundled_fonts} rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts %endif -%if %{run_tests} +%if 0%{?run_tests} %check # These files confuse pytest, and we want to test the installed copy. rm -rf build*/ @@ -331,7 +347,7 @@ export http_proxy=http://127.0.0.1/ MPLCONFIGDIR=$PWD \ MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \ MATPLOTLIBRC=%{buildroot}%{_sysconfdir}/matplotlibrc \ -PYTHONPATH=%{buildroot}%{python3_sitearch} \ +PYTHONPATH=%{buildroot}%{python3_other_sitearch} \ PYTHONDONTWRITEBYTECODE=1 \ xvfb-run -a -s "-screen 0 640x480x24" \ %{__python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \ @@ -341,7 +357,7 @@ PYTHONDONTWRITEBYTECODE=1 \ MPLCONFIGDIR=$PWD \ MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \ MATPLOTLIBRC=%{buildroot}%{_sysconfdir}/matplotlibrc \ -PYTHONPATH=%{buildroot}%{python3_sitearch} \ +PYTHONPATH=%{buildroot}%{python3_other_sitearch} \ PYTHONDONTWRITEBYTECODE=1 \ xvfb-run -a -s "-screen 0 640x480x24" \ %{__python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \ @@ -349,7 +365,7 @@ PYTHONDONTWRITEBYTECODE=1 \ matplotlib.tests.test_backend_qt5 %endif # run_tests -%files -n python3-matplotlib-data +%files -n python%{python3_other_pkgversion}-matplotlib-data %{_sysconfdir}/matplotlibrc %{_datadir}/matplotlib/mpl-data/ %if %{with_bundled_fonts} @@ -357,89 +373,92 @@ PYTHONDONTWRITEBYTECODE=1 \ %endif %if %{with_bundled_fonts} -%files -n python3-matplotlib-data-fonts +%files -n python%{python3_other_pkgversion}-matplotlib-data-fonts %{_datadir}/matplotlib/mpl-data/fonts/ %endif -%files -n python3-matplotlib-doc +%files -n python%{python3_other_pkgversion}-matplotlib-doc %doc examples %if %{with_html} %doc doc/build/html/* %endif -%files -n python3-matplotlib +%files -n python%{python3_other_pkgversion}-matplotlib %license LICENSE/ %doc README.rst -%{python3_sitearch}/*egg-info -%{python3_sitearch}/matplotlib-*-nspkg.pth -%{python3_sitearch}/matplotlib/ -%exclude %{python3_sitearch}/matplotlib/tests/baseline_images/* -%{python3_sitearch}/mpl_toolkits/ -%exclude %{python3_sitearch}/mpl_toolkits/tests/baseline_images/* -%{python3_sitearch}/pylab.py* -%{python3_sitearch}/__pycache__/* -%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4*.py -%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4* -#exclude #{python3_sitearch}/matplotlib/backends/backend_qt5*.py -#exclude #{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5* -%exclude %{python3_sitearch}/matplotlib/backends/_gtk3_compat.py -%exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*.py -%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/_gtk3_compat.* -%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk* -%exclude %{python3_sitearch}/matplotlib/backends/_backend_tk.py -%exclude %{python3_sitearch}/matplotlib/backends/backend_tk*.py -%exclude %{python3_sitearch}/matplotlib/backends/tkagg.py -%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/_backend_tk.* -%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_tk*.* -%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.* -%exclude %{python3_sitearch}/matplotlib/backends/_tkagg.* -%exclude %{python3_sitearch}/matplotlib/backends/backend_wx* -%exclude %{python3_sitearch}/matplotlib/backends/wx_compat.* -%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/backend_wx* -%exclude %{python3_sitearch}/matplotlib/backends/__pycache__/wx_compat.* +%{python3_other_sitearch}/*egg-info +%{python3_other_sitearch}/matplotlib-*-nspkg.pth +%{python3_other_sitearch}/matplotlib/ +%exclude %{python3_other_sitearch}/matplotlib/tests/baseline_images/* +%{python3_other_sitearch}/mpl_toolkits/ +%exclude %{python3_other_sitearch}/mpl_toolkits/tests/baseline_images/* +%{python3_other_sitearch}/pylab.py* +%{python3_other_sitearch}/__pycache__/* +%exclude %{python3_other_sitearch}/matplotlib/backends/backend_qt4*.py +%exclude %{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_qt4* +#exclude #{python3_other_sitearch}/matplotlib/backends/backend_qt5*.py +#exclude #{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_qt5* +%exclude %{python3_other_sitearch}/matplotlib/backends/_gtk3_compat.py +%exclude %{python3_other_sitearch}/matplotlib/backends/backend_gtk*.py +%exclude %{python3_other_sitearch}/matplotlib/backends/__pycache__/_gtk3_compat.* +%exclude %{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_gtk* +%exclude %{python3_other_sitearch}/matplotlib/backends/_backend_tk.py +%exclude %{python3_other_sitearch}/matplotlib/backends/backend_tk*.py +%exclude %{python3_other_sitearch}/matplotlib/backends/tkagg.py +%exclude %{python3_other_sitearch}/matplotlib/backends/__pycache__/_backend_tk.* +%exclude %{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_tk*.* +%exclude %{python3_other_sitearch}/matplotlib/backends/__pycache__/tkagg.* +%exclude %{python3_other_sitearch}/matplotlib/backends/_tkagg.* +%exclude %{python3_other_sitearch}/matplotlib/backends/backend_wx* +%exclude %{python3_other_sitearch}/matplotlib/backends/wx_compat.* +%exclude %{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_wx* +%exclude %{python3_other_sitearch}/matplotlib/backends/__pycache__/wx_compat.* %exclude %{_pkgdocdir}/*/ -%files -n python3-matplotlib-test-data -%{python3_sitearch}/matplotlib/tests/baseline_images/ -%{python3_sitearch}/mpl_toolkits/tests/baseline_images/ +%files -n python%{python3_other_pkgversion}-matplotlib-test-data +%{python3_other_sitearch}/matplotlib/tests/baseline_images/ +%{python3_other_sitearch}/mpl_toolkits/tests/baseline_images/ -%files -n python3-matplotlib-qt4 -%{python3_sitearch}/matplotlib/backends/backend_qt4.py -%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4.* -%{python3_sitearch}/matplotlib/backends/backend_qt4agg.py -%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.* +%files -n python%{python3_other_pkgversion}-matplotlib-qt4 +%{python3_other_sitearch}/matplotlib/backends/backend_qt4.py +%{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_qt4.* +%{python3_other_sitearch}/matplotlib/backends/backend_qt4agg.py +%{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.* # This subpackage is empty because the Qt4 backend imports it, so we leave # these files in the default package, and only use this one for dependencies. -%files -n python3-matplotlib-qt5 -#{python3_sitearch}/matplotlib/backends/backend_qt5.py -#{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5.* -#{python3_sitearch}/matplotlib/backends/backend_qt5agg.py -#{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.* - -%files -n python3-matplotlib-gtk3 -%{python3_sitearch}/matplotlib/backends/backend_gtk*.py -%{python3_sitearch}/matplotlib/backends/_gtk3_compat.py -%{python3_sitearch}/matplotlib/backends/__pycache__/backend_gtk* -%{python3_sitearch}/matplotlib/backends/__pycache__/_gtk3_compat.* - -%files -n python3-matplotlib-tk -%{python3_sitearch}/matplotlib/backends/backend_tk*.py -%{python3_sitearch}/matplotlib/backends/_backend_tk.py -%{python3_sitearch}/matplotlib/backends/tkagg.py -%{python3_sitearch}/matplotlib/backends/__pycache__/backend_tk*.* -%{python3_sitearch}/matplotlib/backends/__pycache__/_backend_tk.* -%{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.* -%{python3_sitearch}/matplotlib/backends/_tkagg.* - -%files -n python3-matplotlib-wx -%{python3_sitearch}/matplotlib/backends/backend_wx*.py -%{python3_sitearch}/matplotlib/backends/wx_compat.py -%{python3_sitearch}/matplotlib/backends/__pycache__/backend_wx* -%{python3_sitearch}/matplotlib/backends/__pycache__/wx_compat.* +%files -n python%{python3_other_pkgversion}-matplotlib-qt5 +#{python3_other_sitearch}/matplotlib/backends/backend_qt5.py +#{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_qt5.* +#{python3_other_sitearch}/matplotlib/backends/backend_qt5agg.py +#{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.* + +%files -n python%{python3_other_pkgversion}-matplotlib-gtk3 +%{python3_other_sitearch}/matplotlib/backends/backend_gtk*.py +%{python3_other_sitearch}/matplotlib/backends/_gtk3_compat.py +%{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_gtk* +%{python3_other_sitearch}/matplotlib/backends/__pycache__/_gtk3_compat.* + +%files -n python%{python3_other_pkgversion}-matplotlib-tk +%{python3_other_sitearch}/matplotlib/backends/backend_tk*.py +%{python3_other_sitearch}/matplotlib/backends/_backend_tk.py +%{python3_other_sitearch}/matplotlib/backends/tkagg.py +%{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_tk*.* +%{python3_other_sitearch}/matplotlib/backends/__pycache__/_backend_tk.* +%{python3_other_sitearch}/matplotlib/backends/__pycache__/tkagg.* +%{python3_other_sitearch}/matplotlib/backends/_tkagg.* + +%files -n python%{python3_other_pkgversion}-matplotlib-wx +%{python3_other_sitearch}/matplotlib/backends/backend_wx*.py +%{python3_other_sitearch}/matplotlib/backends/wx_compat.py +%{python3_other_sitearch}/matplotlib/backends/__pycache__/backend_wx* +%{python3_other_sitearch}/matplotlib/backends/__pycache__/wx_compat.* %changelog +* Sat Feb 23 2019 Raphael Groner - 3.0.2-1.2 +- prepare python3 for epel + * Sat Feb 02 2019 Fedora Release Engineering - 3.0.2-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -585,7 +604,7 @@ PYTHONDONTWRITEBYTECODE=1 \ * Mon Apr 04 2016 Thomas Spura - 1.5.1-1 - update to 1.5.1 (#1276806) -- Add missing requires of dvipng to python3-matplotlib (#1270202) +- Add missing requires of dvipng to python%{python3_other_pkgversion}-matplotlib (#1270202) - use bundled agg (#1276806) - Drop cxx patch (was dropped upstream) - Regenerate search path patch2 @@ -620,7 +639,7 @@ PYTHONDONTWRITEBYTECODE=1 \ * Wed Feb 25 2015 Zbigniew Jędrzejewski-Szmek - 1.4.3-4 - Split out python-matplotlib-gtk, python-matplotlib-gtk3, - python3-matplotlib-gtk3 subpackages (#1067373) + python%{python3_other_pkgversion}-matplotlib-gtk3 subpackages (#1067373) - Add missing requirements on gtk * Tue Feb 24 2015 Zbigniew Jędrzejewski-Szmek - 1.4.3-3 @@ -673,7 +692,7 @@ PYTHONDONTWRITEBYTECODE=1 \ - drop tk patch (upstream solved build issue differently) - redo use system agg patch - delete bundled python-pycxx headers -- fix requires of python3-matplotlib-qt (fixes #988412) +- fix requires of python%{python3_other_pkgversion}-matplotlib-qt (fixes #988412) * Sun Aug 04 2013 Fedora Release Engineering - 1.2.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -682,7 +701,7 @@ PYTHONDONTWRITEBYTECODE=1 \ - agg rebuild. * Wed Apr 10 2013 Thomas Spura - 1.2.0-13 -- use python3 version in python3-matplotlib-qt4 (#915727) +- use python3 version in python%{python3_other_pkgversion}-matplotlib-qt4 (#915727) - include __pycache__ files in correct subpackages on python3 * Wed Apr 3 2013 Thomas Spura - 1.2.0-12 @@ -722,7 +741,7 @@ PYTHONDONTWRITEBYTECODE=1 \ * Thu Nov 22 2012 pcpa - 1.2.0-2 - Build python3 only on f19 or newer (#837156) -- Build requires python3-six if building python3 support (#837156) +- Build requires python%{python3_other_pkgversion}-six if building python3 support (#837156) * Thu Nov 22 2012 pcpa - 1.2.0-1 - Update to version 1.2.0 From 802889175bd1a099d89b0b63d9d9faf0ce9b2526 Mon Sep 17 00:00:00 2001 From: Raphael Groner Date: Feb 23 2019 14:46:23 +0000 Subject: [PATCH 2/3] disable weak dependency --- diff --git a/python-matplotlib.spec b/python-matplotlib.spec index b27f116..b1be901 100644 --- a/python-matplotlib.spec +++ b/python-matplotlib.spec @@ -160,7 +160,7 @@ BuildRequires: python%{python3_other_pkgversion}-pytest-xdist %endif Requires: python%{python3_other_pkgversion}-numpy %if 0%{?fedora} -Recommends: python%{python3_other_pkgversion}-pillow +#Recommends: python%{python3_other_pkgversion}-pillow %endif Requires: python%{python3_other_pkgversion}-pyparsing %if !%{with_bundled_fonts}