.gitignore

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

.python-wheel.metadata

@@ -1 +1 @@
-9adb566f0f481cf14f4d5d5083f93c036b9aeba1 SOURCES/wheel-0.31.1.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,20 @@
-%if 0%{?_with_python27_module}
-%undefine _without_python3
-%endif
-
-# Note that the function of bootstrap is that it disables the test suite and whl
-#   bcond_with bootstrap = tests enabled, package with whl created
+# Note that the only function of bootstrap is that it disables the test suite:
+#   bcond_with bootstrap = tests enabled
 %bcond_with bootstrap
 
-%bcond_with python36_module
+# 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
-
-%if %{with python2}
-%global python2_wheeldir %{_datadir}/python2-wheels
-%global python2_wheelname %python_wheelname
-%endif # with python2
-
-%if %{with python3}
-%global python3_wheeldir %{_datadir}/python3-wheels
-%global python3_wheelname %python_wheelname
-%endif # with python3
 
 Name:           python-%{pypi_name}
-Version:        0.31.1
-Release:        3%{?dist}
+Version:        0.30.0
+Release:        6%{?dist}
 Epoch:          1
 Summary:        Built-package format for Python
 
@@ -35,10 +23,14 @@ URL:            https://github.com/pypa/wheel
 Source0:        %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
 
-# We need to remove wheel's own implementation of crypto due to FIPS concerns.
-# See more: https://bugzilla.redhat.com/show_bug.cgi?id=1731526
-# Upstream commit: https://github.com/pypa/wheel/commit/d3f5918ccbb1c79e2fc42b7766626a0aa20dc438
-Patch0: removed-wheel-signing-and-verifying-features.patch
+# Latest version of wheel requires the package keyrings.alt in order for the tests to pass,
+# however it can't be packaged for Fedora as of yet since the code is not licensed,
+# and as a result wheel fails to build from source.
+# Review request of keyrings.alt: https://bugzilla.redhat.com/show_bug.cgi?id=1365794
+# Until the license issue is resolved upstream, this patch is added to revert
+# the commit from wheel, that introduced this dependency.
+# https://bitbucket.org/pypa/wheel/commits/06841295888fdb430abe12aae29da92107e7360a
+Patch0: remove-keyrings.alt-dependency.patch
 
 %global _description \
 A built-package format for Python.\
@@ -62,55 +54,22 @@ BuildRequires:  python2-pytest
 %description -n python2-%{pypi_name} %{_description}
 
 Python 2 version.
-%endif # with python2
+%endif
 
 
 %if %{with python3}
 %package -n     python3-%{pypi_name}
 Summary:        %{summary}
-%if %{with python36_module}
-BuildRequires:  python36-devel
-BuildRequires:  python36-rpm-macros
-%else
 BuildRequires:  python3-devel
-%endif
 BuildRequires:  python3-setuptools
-%if %{without bootstrap}
+%if ! %{with bootstrap}
 BuildRequires:  python3-pytest
-%endif # without bootstrap
-
-# Require alternatives version that implements the --keep-foreign flag
-Requires(postun): alternatives >= 1.19.1-1
-# For alternatives
-Requires:       python36
-Requires(post): python36
-Requires(postun): python36
-
+%endif
 %{?python_provide:%python_provide python3-%{pypi_name}}
 
 %description -n python3-%{pypi_name} %{_description}
 
 Python 3 version.
-
-%endif # with python3
-
-%if %{without bootstrap}
-%if %{with python2}
-%package -n python2-%{pypi_name}-wheel
-Summary:        The Python wheel module packaged as a wheel
-
-%description -n python2-%{pypi_name}-wheel
-A Python wheel of wheel to use with virtualenv.
-%endif
-
-%if %{with python3}
-%package -n python3-%{pypi_name}-wheel
-Summary:        The Python wheel module packaged as a wheel
-
-%description -n python3-%{pypi_name}-wheel
-A Python wheel of wheel to use with virtualenv.
-%endif
-
 %endif
 
 
@@ -119,92 +78,52 @@ A Python wheel of wheel to use with virtualenv.
 # remove unneeded shebangs
 sed -ie '1d' %{pypi_name}/{egg2wheel,wininst2wheel}.py
 
+# Remove tests for optional functionality which depends on bad crypto
+# (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}
-export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
 %py2_build
-
-%if %{without bootstrap}
-%py2_build_wheel
-%endif # without bootstrap
-
-%endif # with python2
-
+%endif
 %if %{with python3}
 %py3_build
-
-%if %{without bootstrap}
-%py3_build_wheel
-%endif # without bootstrap
-%endif # with python3
+%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
 %endif
 
 %if %{with python2}
-export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
 %py2_install
 mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python2_version}}
-ln -s %{pypi_name}-%{python2_version} %{buildroot}%{_bindir}/%{pypi_name}-2
-%endif
-
-%if %{without bootstrap}
-%if %{with python2}
-mkdir -p %{buildroot}%{python2_wheeldir}
-install -p dist/%{python2_wheelname} -t %{buildroot}%{python2_wheeldir}
-%endif
-
-%if %{with python3}
-mkdir -p %{buildroot}%{python3_wheeldir}
-install -p dist/%{python3_wheelname} -t %{buildroot}%{python3_wheeldir}
 %endif
 
+%if ! %{with bootstrap}
 %check
 rm setup.cfg
 
 # Remove part of the test that uses the "jsonschema" package
 sed -i '/jsonschema/d' tests/test_bdist_wheel.py
 
-export LC_ALL=C.UTF-8
-
 %if %{with python2}
-export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
 PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -v --ignore build
-%endif # with python2
+%endif
 %if %{with python3}
 PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
-%endif # with python3
-%endif # without bootstrap
-
-
-%if %{with python3}
-%post -n python3-%{pypi_name}
-alternatives --add-slave python3 %{_bindir}/python%{python3_version} \
-    %{_bindir}/%{pypi_name}-3 \
-    %{pypi_name}-3 \
-    %{_bindir}/%{pypi_name}-%{python3_version}
-
-%postun -n python3-%{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
 %endif
-
+%endif
 
 %if %{with python2}
 %files -n python2-%{pypi_name}
 %license LICENSE.txt
 %doc CHANGES.txt README.rst
-%{_bindir}/%{pypi_name}-2
 %{_bindir}/%{pypi_name}-%{python2_version}
 %{python2_sitelib}/%{pypi_name}*
 %endif
@@ -213,83 +132,17 @@ fi
 %files -n python3-%{pypi_name}
 %license LICENSE.txt
 %doc CHANGES.txt README.rst
-%ghost %{_bindir}/%{pypi_name}-3
 %{_bindir}/%{pypi_name}-%{python3_version}
 %{python3_sitelib}/%{pypi_name}*
 %endif
 
-%if %{without bootstrap}
-
-%if %{with python2}
-%files -n python2-%{pypi_name}-wheel
-%license LICENSE.txt
-# we own the dir for simplicity
-%dir %{python2_wheeldir}/
-%{python2_wheeldir}/%{python2_wheelname}
-%endif
-
-%if %{with python3}
-%files -n python3-%{pypi_name}-wheel
-%license LICENSE.txt
-# we own the dir for simplicity
-%dir %{python3_wheeldir}/
-%{python3_wheeldir}/%{python3_wheelname}
-%endif
-
-%endif
-
 %changelog
-* Thu Jul 29 2021 Tomas Orsava <torsava@redhat.com> - 1:0.31.1-3
-- Adjusted the postun scriptlets to enable upgrading to RHEL 9
-- Resolves: rhbz#1933055
+* Mon Aug 06 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-6
+- Remove unversioned executables (only *-3.6 should be provided)
 
-* Mon Jul 22 2019 Tomas Orsava <torsava@redhat.com> - 1:0.31.1-2
-- Removed wheel's own implementation of crypto due to FIPS concerns
-Resolves: rhbz#1731526
-
-* Fri Jun 21 2019 Charalampos Stratakis <cstratak@redhat.com> - 1:0.31.1-1
-- Update to 0.31.1
-Resolves: rhbz#1671681
-
-* Thu Jun 20 2019 Miro Hrončok <mhroncok@redhat.com> - 1:0.30.0-14
-- Create python{2,3}-wheel-wheel packages with the wheel of wheel
-Resolves: rhbz#1659550
-
-* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 1:0.30.0-13
-- Bumping due to problems with modular RPM upgrade path
-- Resolves: rhbz#1695587
-
-* Thu Oct 04 2018 Lumír Balhar <lbalhar@redhat.com> - 1:0.30.0-12
-- Fix alternatives - post and postun sections only with python3
-- Resolves: rhbz#1633534
-
-* Mon Oct 01 2018 Lumír Balhar <lbalhar@redhat.com> - 1:0.30.0-11
-- Fix update of alternatives for wheel-3
-- Resolves: rhbz#1633534
-
-* Mon Oct 01 2018 Lumír Balhar <lbalhar@redhat.com> - 1:0.30.0-10
-- Add alternatives for wheel-3
-- Resolves: rhbz#1633534
-
-* Fri Aug 17 2018 Lumír Balhar <lbalhar@redhat.com> - 1:0.30.0-9
-- Remove python3 executables without full version suffix
-- Resolves: rhbz#1615727
-
-* Fri Aug 17 2018 Lumír Balhar <lbalhar@redhat.com> - 1:0.30.0-8
-- Different BR for python36 module build
-- Resolves: rhbz#1615727
-
-* Wed Aug 08 2018 Lumír Balhar <lbalhar@redhat.com> - 1:0.30.0-7
-- Remove unversioned binaries from python2 subpackage
-- Resolves: rhbz#1613343
-
-* Tue Aug 07 2018 Lumír Balhar <lbalhar@redhat.com> - 1:0.30.0-6
-- Disable tests (enable bootstrap)
-- Build Python 3 version in python27 module
-
-* Tue Jul 03 2018 Tomas Orsava <torsava@redhat.com> - 1:0.30.0-5
-- This package might be built with the non-modular python2 package from RHEL8
-  buildroot and thus we need to enable it
+* Mon Jun 25 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-5
+- Don't build the python2 subpackage
+  https://bugzilla.redhat.com/show_bug.cgi?id=1594353
 
 * Tue Jun 12 2018 Petr Viktorin <pviktori@redhat.com> - 1:0.30.0-4
 - Also remove test dependency on python3-jsonschema