From 8081338488a182d53cfb40ac293d279ef788cfef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 26 Aug 2019 13:15:05 +0200 Subject: [PATCH] Stop using python2-pip --- python-six.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/python-six.spec b/python-six.spec index ac93284..05b77ef 100644 --- a/python-six.spec +++ b/python-six.spec @@ -10,7 +10,7 @@ Name: python-%{modname} Version: 1.12.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Python 2 and 3 compatibility utilities License: MIT @@ -37,8 +37,6 @@ BuildRequires: python2-pytest BuildRequires: python2-tkinter %endif -BuildRequires: python2-pip - %description -n python2-%{modname} %{_description} Python 2 version. @@ -68,16 +66,20 @@ Python 3 version. %build +%if %{with python2} +%py2_build +%endif + %py3_build_wheel %install -%py3_install_wheel %{python_wheelname} - %if %{with python2} -%py2_install_wheel %{python_wheelname} +%py2_install %endif +%py3_install_wheel %{python_wheelname} + %if %{with tests} %check %if 0%{?fedora} < 32 @@ -91,7 +93,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -rfsxX test_six.py %files -n python2-%{modname} %license LICENSE %doc README.rst documentation/index.rst -%{python2_sitelib}/%{modname}-*.dist-info/ +%{python2_sitelib}/%{modname}-*.egg-info/ %{python2_sitelib}/%{modname}.py* %endif @@ -104,6 +106,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -rfsxX test_six.py %changelog +* Mon Aug 26 2019 Miro Hrončok - 1.12.0-6 +- Reduce Python 2 build dependencies + * Fri Aug 16 2019 Miro Hrončok - 1.12.0-5 - Rebuilt for Python 3.8