From c3e5def1386fd68147423fbc046bfe09af5cf65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 9 Sep 2019 16:39:27 +0200 Subject: [PATCH] Drop python2-wheel --- python-wheel.spec | 43 ++++--------------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) diff --git a/python-wheel.spec b/python-wheel.spec index 52b9eb2..674697a 100644 --- a/python-wheel.spec +++ b/python-wheel.spec @@ -2,15 +2,13 @@ # bcond_with bootstrap = tests enabled, package with whl created %bcond_with bootstrap -%bcond_without python2 - %global pypi_name wheel %global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl %global python_wheeldir %{_datadir}/python-wheels Name: python-%{pypi_name} Version: 0.33.6 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: Built-package format for Python @@ -36,21 +34,6 @@ compatible install in a way that is very close to the on-disk format. %description %{_description} -%if %{with python2} -%package -n python2-%{pypi_name} -Summary: %{summary} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%if %{without bootstrap} && 0%{?fedora} < 32 -BuildRequires: python2-pytest -%endif -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} %{_description} - -Python 2 version. -%endif - %package -n python3-%{pypi_name} Summary: %{summary} @@ -87,9 +70,6 @@ test -s wheel/cli/install.py || echo "# empty" > wheel/cli/install.py %build -%if %{with python2} -%py2_build -%endif %py3_build %if %{without bootstrap} @@ -98,12 +78,6 @@ test -s wheel/cli/install.py || echo "# empty" > wheel/cli/install.py %install -%if %{with python2} -%py2_install -mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python2_version}} -ln -s %{pypi_name}-%{python2_version} %{buildroot}%{_bindir}/%{pypi_name}-2 -%endif - %py3_install mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}} ln -s %{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3 @@ -116,21 +90,9 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} %check rm setup.cfg -%if %{with python2} && 0%{?fedora} < 32 -PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -v --ignore build -%endif PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build %endif -%if %{with python2} -%files -n python2-%{pypi_name} -%license LICENSE.txt -%doc README.rst -%{_bindir}/%{pypi_name}-2 -%{_bindir}/%{pypi_name}-%{python2_version} -%{python2_sitelib}/%{pypi_name}* -%endif - %files -n python3-%{pypi_name} %license LICENSE.txt %doc README.rst @@ -148,6 +110,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build %endif %changelog +* Mon Sep 09 2019 Miro Hrončok - 1:0.33.6-2 +- Drop python2-wheel + * Tue Aug 27 2019 Miro Hrončok - 1:0.33.6-1 - Update to 0.33.6 (#1708194) - Don't add the m ABI flag to wheel names on Python 3.8