.gitignore

@@ -1 +1 @@
-SOURCES/wheel-0.33.6.tar.gz
+SOURCES/wheel-0.30.0.tar.gz

.python-wheel.metadata

@@ -1 +1 @@
-7fb61bcca7afdd18e087b75c649792c49988f815 SOURCES/wheel-0.33.6.tar.gz
+bf1b7cf2c46378b7300ad9d4e2b86e462cdd7f73 SOURCES/wheel-0.30.0.tar.gz

SOURCES/remove-keyrings.alt-dependency.patch

@@ -0,0 +1,27 @@
+diff -uNr wheel-0.30.0.orig/setup.py wheel-0.30.0/setup.py
+--- wheel-0.30.0.orig/setup.py	2017-07-29 22:08:53.000000000 +0200
++++ wheel-0.30.0/setup.py	2018-02-23 13:30:44.736351678 +0100
+@@ -38,7 +38,7 @@
+       license='MIT',
+       packages=find_packages(),
+       extras_require={
+-          'signatures': ['keyring', 'keyrings.alt'],
++          'signatures': ['keyring'],
+           'signatures:sys_platform!="win32"': ['pyxdg'],
+           'faster-signatures': ['ed25519ll'],
+           'tool': [],
+diff -uNr wheel-0.30.0.orig/wheel/tool/__init__.py wheel-0.30.0/wheel/tool/__init__.py
+--- wheel-0.30.0.orig/wheel/tool/__init__.py	2017-08-06 13:31:33.000000000 +0200
++++ wheel-0.30.0/wheel/tool/__init__.py	2018-02-23 13:30:33.861317739 +0100
+@@ -31,10 +31,9 @@
+     try:
+         from ..signatures import keys
+         import keyring
+-        assert keyring.get_keyring().priority
+     except (ImportError, AssertionError):
+         raise WheelError(
+-            "Install wheel[signatures] (requires keyring, keyrings.alt, pyxdg) for signatures.")
++            "Install wheel[signatures] (requires keyring, pyxdg) for signatures.")
+ 
+     return keys.WheelKeys, keyring
+ 

SPECS/python-wheel.spec

@@ -1,32 +1,36 @@
-# The function of bootstrap is that it disables the wheel subpackage
+# Note that the only function of bootstrap is that it disables the test suite:
+#   bcond_with bootstrap = tests enabled
 %bcond_with bootstrap
-%bcond_without tests
+
+# Note(hguemar): EL7 has no python3 stack but EPEL does
+%if 0%{?rhel} && 0%{?rhel} <= 7 && 0%{!?epel:1}
+%define _without_python3 1
+%endif
+
+%bcond_with python2
+%bcond_without python3
 
 %global pypi_name wheel
-%global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl
-%global python_wheeldir %{_datadir}/python38-wheels
 
 Name:           python-%{pypi_name}
-Version:        0.33.6
+Version:        0.30.0
 Release:        6%{?dist}
+Epoch:          1
 Summary:        Built-package format for Python
 
 License:        MIT
 URL:            https://github.com/pypa/wheel
 Source0:        %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
-# Exclude i686 arch. Due to a modularity issue it's being added to the
-# x86_64 compose of CRB, but we don't want to ship it at all.
-# See: https://projects.engineering.redhat.com/browse/RCM-72605
-ExcludeArch:    i686
 
-%if %{with tests}
+# Latest version of wheel requires the package keyrings.alt in order for the tests to pass,
-# several tests compile extensions
+# however it can't be packaged for Fedora as of yet since the code is not licensed,
-# those tests are skipped if gcc is not found
+# and as a result wheel fails to build from source.
-BuildRequires:  gcc
+# Review request of keyrings.alt: https://bugzilla.redhat.com/show_bug.cgi?id=1365794
-%endif
+# Until the license issue is resolved upstream, this patch is added to revert
-
+# the commit from wheel, that introduced this dependency.
-%{?python_enable_dependency_generator}
+# https://bitbucket.org/pypa/wheel/commits/06841295888fdb430abe12aae29da92107e7360a
+Patch0: remove-keyrings.alt-dependency.patch
 
 %global _description \
 A built-package format for Python.\
@@ -37,158 +41,118 @@ compatible install in a way that is very close to the on-disk format.
 
 %description %{_description}
 
-
+%if %{with python2}
-%package -n     python%{python3_pkgversion}-%{pypi_name}
+%package -n     python2-%{pypi_name}
 Summary:        %{summary}
-BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python2-devel
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
+BuildRequires:  python2-setuptools
-BuildRequires:  python%{python3_pkgversion}-setuptools
+%if ! %{with bootstrap}
-%if %{with tests}
+BuildRequires:  python2-pytest
-BuildRequires:  python%{python3_pkgversion}-pytest
 %endif
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
+%{?python_provide:%python_provide python2-%{pypi_name}}
 
-# Require alternatives version that implements the --keep-foreign flag
+%description -n python2-%{pypi_name} %{_description}
-Requires(postun): alternatives >= 1.19.1-1
-# python38 installs the alternatives master symlink to which we attach a slave
-Requires: python38
-Requires(post): python38
-Requires(postun): python38
 
-%description -n python%{python3_pkgversion}-%{pypi_name} %{_description}
+Python 2 version.
+%endif
+
+
+%if %{with python3}
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+%if ! %{with bootstrap}
+BuildRequires:  python3-pytest
+%endif
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+%description -n python3-%{pypi_name} %{_description}
 
 Python 3 version.
-
-
-%if %{without bootstrap}
-%package -n     python%{python3_pkgversion}-%{pypi_name}-wheel
-Summary:        The Python wheel module packaged as a wheel
-
-%description -n     python%{python3_pkgversion}-%{pypi_name}-wheel
-A Python wheel of wheel to use with virtualenv.
 %endif
 
 
 %prep
 %autosetup -n %{pypi_name}-%{version} -p1
+# remove unneeded shebangs
+sed -ie '1d' %{pypi_name}/{egg2wheel,wininst2wheel}.py
 
-# Empty files make rpmlint sad
+# Remove tests for optional functionality which depends on bad crypto
-test -s wheel/cli/install.py || echo "# empty" > wheel/cli/install.py
+# (pycryptopp -> python-keyring -> python-wheel)
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1561576
+rm tests/test_signatures.py
+sed -i -e's/^def test_keygen():$/def skip_test_keygen():/' tests/test_tool.py
 
 
 %build
+%if %{with python2}
+%py2_build
+%endif
+%if %{with python3}
 %py3_build
-
-%if %{without bootstrap}
-%py3_build_wheel
 %endif
 
 
 %install
+%if %{with python3}
 %py3_install
 mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
-# Create an empty file to be used by `alternatives`
-touch %{buildroot}%{_bindir}/%{pypi_name}-3
-
-%if %{without bootstrap}
-mkdir -p %{buildroot}%{python_wheeldir}
-install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
 %endif
 
+%if %{with python2}
+%py2_install
+mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python2_version}}
+%endif
 
-%if %{with tests}
+%if ! %{with bootstrap}
 %check
 rm setup.cfg
-PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3.8 -v --ignore build
+
+# Remove part of the test that uses the "jsonschema" package
+sed -i '/jsonschema/d' tests/test_bdist_wheel.py
+
+%if %{with python2}
+PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -v --ignore build
+%endif
+%if %{with python3}
+PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
+%endif
 %endif
 
-
+%if %{with python2}
-%post -n python%{python3_pkgversion}-%{pypi_name}
+%files -n python2-%{pypi_name}
-alternatives --add-slave python3 %{_bindir}/python%{python3_version} \
-    %{_bindir}/%{pypi_name}-3 \
-    %{pypi_name}-3 \
-    %{_bindir}/%{pypi_name}-%{python3_version}
-
-%postun -n python%{python3_pkgversion}-%{pypi_name}
-# Do this only during uninstall process (not during update)
-if [ $1 -eq 0 ]; then
-    alternatives --keep-foreign --remove-slave python3 %{_bindir}/python%{python3_version} \
-        %{pypi_name}-3
-fi
-
-
-%files -n python%{python3_pkgversion}-%{pypi_name}
 %license LICENSE.txt
-%doc README.rst
+%doc CHANGES.txt README.rst
+%{_bindir}/%{pypi_name}-%{python2_version}
+%{python2_sitelib}/%{pypi_name}*
+%endif
+
+%if %{with python3}
+%files -n python3-%{pypi_name}
+%license LICENSE.txt
+%doc CHANGES.txt README.rst
 %{_bindir}/%{pypi_name}-%{python3_version}
-%ghost %{_bindir}/%{pypi_name}-3
 %{python3_sitelib}/%{pypi_name}*
-
-%if %{without bootstrap}
-%files -n python%{python3_pkgversion}-%{pypi_name}-wheel
-%license LICENSE.txt
-# we own the dir for simplicity
-%dir %{python_wheeldir}/
-%{python_wheeldir}/%{python_wheelname}
 %endif
 
 %changelog
-* Mon Aug 02 2021 Tomas Orsava <torsava@redhat.com> - 0.33.6-6
+* Mon Aug 06 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-6
-- Adjusted the postun scriptlets to enable upgrading to RHEL 9
+- Remove unversioned executables (only *-3.6 should be provided)
-- Resolves: rhbz#1933055
 
-* Mon Mar 09 2020 Tomas Orsava <torsava@redhat.com> - 0.33.6-5
+* Mon Jun 25 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-5
-- Implement the alternatives system for the executables
+- Don't build the python2 subpackage
-- Resolves: rhbz#1807041
+  https://bugzilla.redhat.com/show_bug.cgi?id=1594353
 
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 0.33.6-4
+* Tue Jun 12 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-4
-- Exclude unsupported i686 arch
+- Also remove test dependency on python3-jsonschema
 
-* Wed Nov 20 2019 Tomas Orsava <torsava@redhat.com> - 0.33.6-3
+* Wed May 30 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-3
-- Modify for RHEL8
+- Remove test dependency on python2-jsonschema
+  https://bugzilla.redhat.com/show_bug.cgi?id=1584189
 
-* Mon Sep 09 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.6-2
+* Tue Apr 10 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-2
-- Drop python2-wheel
+- Remove build-time (test) dependency on python-keyring
-
-* Tue Aug 27 2019 Miro Hrončok <mhroncok@redhat.com> - 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
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.1-5
-- Rebuilt for Python 3.8
-
-* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.1-4
-- Bootstrap for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.33.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.33.1-2
-- Make /usr/bin/wheel Python 3
-
-* Mon Feb 25 2019 Charalampos Stratakis <cstratak@redhat.com> - 1:0.33.1-1
-- Update to 0.33.1
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.32.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Sep 30 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.32.0-1
-- Update to 0.32.0
-
-* Wed Aug 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.31.1-3
-- Create python-wheel-wheel package with the wheel of wheel
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.31.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sat Jul 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:0.31.1-1
-- Update to 0.31.1
-
-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.30.0-3
-- Rebuilt for Python 3.7
-
-* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 1:0.30.0-2
-- Bootstrap for Python 3.7
 
 * Fri Feb 23 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:0.30.0-1
 - Update to 0.30.0