PR#2: Cleanup spec conditionals - rpms/python-matplotlib

		`@@ -1,9 +1,3 @@`
		`- %if 0%{?fedora} \|\| 0%{?rhel} > 7`
		`- %global with_python3 1`
		`- %else`
		`- %global with_python3 0`
		`- %endif`
		`- %global __provides_exclude_from ./site-packages/.\\.so$`
		`%global with_html 0`

		`# It seems like there's some kind of weird occasional error where a`
		`@@ -14,21 +8,6 @@`
		`# happen.`
		`%global run_tests 1`

		`-`
		`- # On RHEL 7 onwards, don't build with wx:`
		`- %if 0%{?rhel} >= 7`
		`- %global with_wx 0`
		`- %else`
		`- %global with_wx 1`
		`- %endif`
		`-`
		`- # On Fedora 21 onwards, enable Qt5 backend:`
		`- %if 0%{?fedora} \|\| 0%{?rhel} > 7`
		`- %global with_qt5 1`
		`- %else`
		`- %global with_qt5 0`
		`- %endif`
		`-`
		`# the default backend; one of GTK GTKAgg GTKCairo GTK3Agg GTK3Cairo`
		`# CocoaAgg MacOSX Qt4Agg Qt5Agg TkAgg WX WXAgg Agg Cairo GDK PS PDF SVG`
		`%global backend TkAgg`
		`@@ -55,9 +34,8 @@`

		`Name: python-matplotlib`
		`Version: 2.1.2`
		`- Release: 2%{?rctag:.%{rctag}}%{?dist}`
		`+ Release: 3%{?rctag:.%{rctag}}%{?dist}`
		`Summary: Python 2D plotting library`
		`- Group: Development/Libraries`
		`# qt4_editor backend is MIT`
		`License: Python and MIT`
		`URL: http://matplotlib.org`
		`@@ -97,27 +75,24 @@`

		`%package -n python2-matplotlib`
		`Summary: Python 2D plotting library`
		`- BuildRequires: numpy`
		`- BuildRequires: pyparsing`
		`- BuildRequires: python-dateutil`
		`- BuildRequires: python-pyside`
		`- BuildRequires: python-setuptools`
		`- BuildRequires: python-six`
		`- BuildRequires: python-subprocess32`
		`+ BuildRequires: python2-numpy`
		`+ BuildRequires: python2-pyparsing`
		`+ BuildRequires: python2-dateutil`
		`+ BuildRequires: python2-pyside`
		`+ BuildRequires: python2-setuptools`
		`+ BuildRequires: python2-six`
		`+ BuildRequires: python2-subprocess32`
		`BuildRequires: python2-devel`
		`- %if 0%{?fedora} > 26 \|\| 0%{?rhel} > 7`
		`- BuildRequires: python2-backports`
		`- %endif`
		`BuildRequires: python2-backports-functools_lru_cache`
		`BuildRequires: python2-pillow`
		`- BuildRequires: pytz`
		`+ BuildRequires: python2-pytz`
		`%if %{with_html}`
		`BuildRequires: %{_bindir}/pdftops`
		`- # circular dependency: python-basemap requires matplotlib`
		`- BuildRequires: python-basemap`
		`- BuildRequires: python-ipython-sphinx`
		`- BuildRequires: python-numpydoc`
		`- BuildRequires: python-scikit-image`
		`+ # circular dependency: python2-basemap requires matplotlib`
		`+ BuildRequires: python2-basemap`
		`+ BuildRequires: python2-ipython-sphinx`
		`+ BuildRequires: python2-numpydoc`
		`+ BuildRequires: python2-scikit-image`
		`BuildRequires: python2-colorspacious`
		`BuildRequires: python2-cycler >= 0.10.0`
		`%endif`
		`@@ -128,24 +103,20 @@`
		`%endif`
		`Requires: dejavu-sans-fonts`
		`Requires: dvipng`
		`- Requires: numpy`
		`- Requires: pyparsing`
		`+ Requires: python2-numpy`
		`+ Requires: python2-pyparsing`
		`Requires: python2-cycler >= 0.10.0`
		`- Requires: python-dateutil`
		`+ Requires: python2-dateutil`
		`Requires: python2-backports-functools_lru_cache`
		`Requires: python-matplotlib-data = %{version}-%{release}`
		`%{?backend_subpackage:Requires: python2-matplotlib-%{backend_subpackage}%{?_isa} = %{version}-%{release}}`
		`Recommends: python2-pillow`
		`- Requires: python-six`
		`- Requires: python-subprocess32`
		`- Requires: pytz`
		`+ Requires: python2-six`
		`+ Requires: python2-subprocess32`
		`+ Requires: python2-pytz`
		`%if !%{with_bundled_fonts}`
		`- %if 0%{?fedora} \|\| 0%{?rhel} > 7`
		`Requires: stix-math-fonts`
		`%else`
		`- Requires: stix-fonts`
		`- %endif`
		`- %else`
		`Provides: bundled(stix-math-fonts)`
		`%endif`
		`%{?python_provide:%python_provide python2-matplotlib}`
		`@@ -168,9 +139,8 @@`

		`%package -n python2-matplotlib-qt4`
		`Summary: Qt4 backend for python-matplotlib`
		`- Group: Development/Libraries`
		`BuildRequires: PyQt4-devel`
		`- Requires: PyQt4`
		`+ Requires: python2-PyQt4`
		`Requires: python2-matplotlib%{?_isa} = %{version}-%{release}`
		`Requires: python2-matplotlib-qt5`
		`%{?python_provide:%python_provide python2-matplotlib-qt4}`
		`@@ -178,22 +148,18 @@`
		`%description -n python2-matplotlib-qt4`
		`%{summary}`

		`- %if %{with_qt5}`
		`%package -n python2-matplotlib-qt5`
		`Summary: Qt5 backend for python-matplotlib`
		`- Group: Development/Libraries`
		`- BuildRequires: python-qt5`
		`- Requires: python-qt5`
		`+ BuildRequires: python2-qt5`
		`+ Requires: python2-qt5`
		`Requires: python2-matplotlib%{?_isa} = %{version}-%{release}`
		`%{?python_provide:%python_provide python2-matplotlib-qt5}`

		`%description -n python2-matplotlib-qt5`
		`%{summary}`
		`- %endif # with_qt5`

		`%package -n python2-matplotlib-gtk`
		`Summary: GTK backend for python-matplotlib`
		`- Group: Development/Libraries`
		`BuildRequires: gtk2-devel`
		`BuildRequires: pycairo-devel`
		`BuildRequires: pygtk2-devel`
		`@@ -207,7 +173,6 @@`

		`%package -n python2-matplotlib-gtk3`
		`Summary: GTK3 backend for python-matplotlib`
		`- Group: Development/Libraries`
		`# This should be converted to typelib(Gtk) when supported`
		`BuildRequires: gtk3`
		`BuildRequires: pygobject3-base`
		`@@ -221,7 +186,6 @@`

		`%package -n python2-matplotlib-tk`
		`Summary: Tk backend for python-matplotlib`
		`- Group: Development/Libraries`
		`BuildRequires: tcl-devel`
		`BuildRequires: tkinter`
		`BuildRequires: tk-devel`
		`@@ -232,26 +196,22 @@`
		`%description -n python2-matplotlib-tk`
		`%{summary}`

		`- %if %{with_wx}`
		`%package -n python2-matplotlib-wx`
		`Summary: wxPython backend for python-matplotlib`
		`- Group: Development/Libraries`
		`BuildRequires: wxPython-devel`
		`Requires: python2-matplotlib%{?_isa} = %{version}-%{release}`
		`- Requires: wxPython`
		`+ Requires: python2-wxpython`
		`%{?python_provide:%python_provide python2-matplotlib-wx}`

		`%description -n python2-matplotlib-wx`
		`%{summary}`
		`- %endif # with_wx`

		`%package -n python2-matplotlib-doc`
		`Summary: Documentation files for python-matplotlib`
		`- Group: Documentation`
		`%if %{with_html}`
		`BuildRequires: dvipng`
		`BuildRequires: graphviz`
		`- BuildRequires: python-sphinx`
		`+ BuildRequires: python2-sphinx`
		`BuildRequires: tex(latex)`
		`BuildRequires: tex-preview`
		`%endif`
		`@@ -283,10 +243,8 @@`
		`%{summary}`
		`%endif`

		`- %if %{with_python3}`
		`%package -n python3-matplotlib`
		`Summary: Python 2D plotting library`
		`- Group: Development/Libraries`
		`BuildRequires: python3-cairo`
		`BuildRequires: python3-cycler >= 0.10.0`
		`BuildRequires: python3-dateutil`
		`@@ -314,12 +272,8 @@`
		`Requires: python3-pytz`
		`Requires: python3-six`
		`%if !%{with_bundled_fonts}`
		`- %if 0%{?fedora} \|\| 0%{?rhel} > 7`
		`Requires: stix-math-fonts`
		`%else`
		`- Requires: stix-fonts`
		`- %endif`
		`- %else`
		`Provides: bundled(stix-math-fonts)`
		`%endif`
		`%{?python_provide:%python_provide python3-matplotlib}`
		`@@ -337,7 +291,6 @@`

		`%package -n python3-matplotlib-qt4`
		`Summary: Qt4 backend for python3-matplotlib`
		`- Group: Development/Libraries`
		`BuildRequires: python3-PyQt4-devel`
		`Requires: python3-matplotlib%{?_isa} = %{version}-%{release}`
		`Requires: python3-matplotlib-qt5`
		`@@ -347,10 +300,8 @@`
		`%description -n python3-matplotlib-qt4`
		`%{summary}`

		`- %if %{with_qt5}`
		`%package -n python3-matplotlib-qt5`
		`Summary: Qt5 backend for python3-matplotlib`
		`- Group: Development/Libraries`
		`BuildRequires: python3-qt5`
		`Requires: python3-matplotlib%{?_isa} = %{version}-%{release}`
		`Requires: python3-qt5`
		`@@ -358,12 +309,10 @@`

		`%description -n python3-matplotlib-qt5`
		`%{summary}`
		`- %endif # with_qt5`

		`# gtk2 never worked in Python 3 afaict, so no need for -gtk subpackage`
		`%package -n python3-matplotlib-gtk3`
		`Summary: GTK3 backend for python3-matplotlib`
		`- Group: Development/Libraries`
		`# This should be converted to typelib(Gtk) when supported`
		`BuildRequires: gtk3`
		`BuildRequires: python3-gobject`
		`@@ -377,7 +326,6 @@`

		`%package -n python3-matplotlib-tk`
		`Summary: Tk backend for python3-matplotlib`
		`- Group: Development/Libraries`
		`BuildRequires: python3-tkinter`
		`Requires: python3-matplotlib%{?_isa} = %{version}-%{release}`
		`Requires: python3-tkinter`
		`@@ -385,7 +333,6 @@`

		`%description -n python3-matplotlib-tk`
		`%{summary}`
		`- %endif`

		`%prep`
		`%autosetup -n matplotlib-%{version}%{?rctag} -N`
		`@@ -393,7 +340,6 @@`

		`# Fedora-specific patches follow:`
		`%patch1001 -p1`
		`- %if 0%{?fedora} > 26 \|\| 0%{?rhel} > 7`
		`# Updated test images for FreeType 2.8.`
		`gzip -dc %SOURCE1000 \| tar xvf - --transform='s~^$[^/]\+$/~lib/\1/tests/baseline_images/~'`
		`%ifarch i686 armv7hl`
		`@@ -406,11 +352,6 @@`
		`%ifarch aarch64 ppc64 ppc64le s390x`
		`%patch1005 -p1`
		`%endif`
		`- %else`
		`- # Small tweaks to tolerances for FreeType 2.7.1.`
		`- %patch1002 -p1`
		`- %patch1003 -p1`
		`- %endif`
		`%ifarch i686`
		`%patch1004 -p1`
		`%endif`
		`@@ -451,13 +392,11 @@`
		`# package doesn't drag in dependencies`
		`find examples -name '*.py' -exec chmod a-x '{}' \;`

		`- %if %{with_python3}`
		`MPLCONFIGDIR=$PWD \`
		`MATPLOTLIBDATA=$PWD/lib/matplotlib/mpl-data \`
		`xvfb-run %{__python3} setup.py build`
		`# documentation cannot be built with python3 due to syntax errors`
		`# https://github.com/matplotlib/matplotlib/issues/5805`
		`- %endif`

		`%install`
		`export http_proxy=http://127.0.0.1/`
		`@@ -474,13 +413,11 @@`
		`rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts`
		`%endif`

		`- %if %{with_python3}`
		`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`
		`rm -fr %{buildroot}%{python3_sitearch}/matplotlib/mpl-data`
		`- %endif`

		`%if %{run_tests}`
		`%check`
		`@@ -498,13 +435,11 @@`
		`xvfb-run -a -s "-screen 0 640x480x24" \`
		`%{__python2} -m pytest --pyargs matplotlib -m 'not network' -k 'not test_polycollection_close' -ra`

		`- %if %{with_python3}`
		`MPLCONFIGDIR=$PWD \`
		`MATPLOTLIBDATA=%{buildroot}%{_datadir}/matplotlib/mpl-data \`
		`PYTHONPATH=%{buildroot}%{python3_sitearch} \`
		`xvfb-run -a -s "-screen 0 640x480x24" \`
		`%{__python3} tests.py -m 'not network' -ra`
		`- %endif`
		`%endif # run_tests`

		`%files -n python-matplotlib-data`
		`@@ -545,11 +480,9 @@`
		`%{python2_sitearch}/matplotlib/backends/backend_qt4.*`
		`%{python2_sitearch}/matplotlib/backends/backend_qt4agg.*`

		`- %if %{with_qt5}`
		`%files -n python2-matplotlib-qt5`
		`%{python2_sitearch}/matplotlib/backends/backend_qt5.*`
		`%{python2_sitearch}/matplotlib/backends/backend_qt5agg.*`
		`- %endif # with_qt5`

		`%files -n python2-matplotlib-gtk`
		`%{python2_sitearch}/matplotlib/backends/backend_gtk.py*`
		`@@ -565,11 +498,9 @@`
		`%{python2_sitearch}/matplotlib/backends/tkagg.py*`
		`%{python2_sitearch}/matplotlib/backends/_tkagg.so`

		`- %if %{with_wx}`
		`%files -n python2-matplotlib-wx`
		`%{python2_sitearch}/matplotlib/backends/backend_wx.*`
		`%{python2_sitearch}/matplotlib/backends/backend_wxagg.*`
		`- %endif # with_wx`

		`%files -n python2-matplotlib-doc`
		`%doc examples`
		`@@ -577,7 +508,6 @@`
		`%doc doc/build/html/*`
		`%endif`

		`- %if %{with_python3}`
		`%files -n python3-matplotlib`
		`%license LICENSE/`
		`%doc README.rst CONTRIBUTING.md`
		`@@ -608,13 +538,11 @@`
		`%{python3_sitearch}/matplotlib/backends/backend_qt4agg.*`
		`%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt4agg.*`

		`- %if %{with_qt5}`
		`%files -n python3-matplotlib-qt5`
		`%{python3_sitearch}/matplotlib/backends/backend_qt5.*`
		`%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*`
		`%{python3_sitearch}/matplotlib/backends/backend_qt5agg.*`
		`%{python3_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*`
		`- %endif # with_qt5`

		`%files -n python3-matplotlib-gtk3`
		`%{python3_sitearch}/matplotlib/backends/backend_gtk*`
		`@@ -626,10 +554,13 @@`
		`%{python3_sitearch}/matplotlib/backends/tkagg.*`
		`%{python3_sitearch}/matplotlib/backends/__pycache__/tkagg.*`
		`%{python3_sitearch}/matplotlib/backends/_tkagg.*`
		`- %endif`

		`%changelog`
		`- * Mon Feb 05 2018 Karsten Hopp <karsten@redhat.com> - 2.1.2-2}`
		`+ * Tue Mar 13 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.2-3`
		`+ - Cleanup spec file of old conditionals`
		`+ - Use more python2- dependencies`
		`+`
		`+ * Mon Feb 05 2018 Karsten Hopp <karsten@redhat.com> - 2.1.2-2`
		`- update and fix spec file conditionals`

		`* Sun Jan 21 2018 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 2.1.2-1`
		`@@ -929,7 +860,7 @@`
		`- fix build with new Tkinter which doesn't return an expected value in __version__`

		`* Thu Sep 15 2011 Jef Spaleta <jspaleta@fedoraproject.org> - 1.0.1-13`
		`- - apply upstream bugfix for timezone formatting (Bug 735677)`
		`+ - apply upstream bugfix for timezone formatting (Bug 735677)`

		`* Fri May 20 2011 Orion Poplawski <orion@cora.nwra.com> - 1.0.1-12`
		`- Add Requires dvipng (Bug 684836)`
		`@@ -987,20 +918,20 @@`
		`- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild`

		`* Thu Jul 8 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 1.0.0-1`
		`- - New upstream release`
		`- - Remove undistributable file from bundled agg library`
		`+ - New upstream release`
		`+ - Remove undistributable file from bundled agg library`

		`* Thu Jul 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.3-1`
		`- - New upstream release`
		`+ - New upstream release`

		`* Thu May 27 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-4`
		`- - Upstream patch to fix deprecated gtk tooltip warning.`
		`+ - Upstream patch to fix deprecated gtk tooltip warning.`

		`* Mon Apr 12 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-2`
		`- - Bump to rebuild against numpy 1.3`
		`+ - Bump to rebuild against numpy 1.3`

		`* Thu Apr 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-1`
		`- - Bump to rebuild against numpy 1.4.0`
		`+ - Bump to rebuild against numpy 1.4.0`

		`* Fri Dec 11 2009 Jon Ciesla <limb@jcomserv.net> - 0.99.1.2`
		`- Update to 0.99.1.2`
		`@@ -1061,7 +992,7 @@`
		`- Rebuild for Tcl/Tk downgrade`

		`* Sat Feb 10 2007 Jef Spaleta <jspaleta@gmail.com> 0.90.0-2`
		`- - Release bump for rebuild against new tk`
		`+ - Release bump for rebuild against new tk`

		`* Fri Feb 09 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.0-1`
		`- Update to 0.90.0`
		`@@ -1123,7 +1054,7 @@`
		`- New upstream version 0.84`

		`* Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-3`
		`- - bump release`
		`+ - bump release`

		`* Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-2`
		`- Add Requires: python-numeric, pytz, python-dateutil`

qulogic commented 6 years ago

It doesn't seem like anyone wants to build for Fedora 26, so remove checks for that. The only el* branches are 4 and 5, so drop any checks for non-Fedora systems. Unless someone is building that elsewhere, I don't see any point in leaving those conditionals in.

4 new commits added