From 8accaa3b0f1e17c99af53e5ed81f1f516a5b10d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 16 Jul 2019 16:15:00 +0200
Subject: [PATCH] Make /usr/bin/wheel Python 3

---
 python-wheel.spec | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/python-wheel.spec b/python-wheel.spec
index a8b359b..74726e2 100644
--- a/python-wheel.spec
+++ b/python-wheel.spec
@@ -10,7 +10,7 @@
 
 Name:           python-%{pypi_name}
 Version:        0.33.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        Built-package format for Python
 
@@ -63,6 +63,7 @@ BuildRequires:  python3-setuptools
 BuildRequires:  python3-pytest
 %endif
 %{?python_provide:%python_provide python3-%{pypi_name}}
+Conflicts:      python-%{pypi_name} < %{version}-%{release}
 
 %description -n python3-%{pypi_name} %{_description}
 
@@ -97,17 +98,17 @@ test -s wheel/cli/install.py || echo "# empty" > wheel/cli/install.py
 
 
 %install
-%py3_install
-mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
-ln -s %{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3
-
 %if %{with python2}
 %py2_install
 mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python2_version}}
 ln -s %{pypi_name}-%{python2_version} %{buildroot}%{_bindir}/%{pypi_name}-2
-ln -s %{pypi_name}-2 %{buildroot}%{_bindir}/%{pypi_name}
 %endif
 
+%py3_install
+mv %{buildroot}%{_bindir}/%{pypi_name}{,-%{python3_version}}
+ln -s %{pypi_name}-%{python3_version} %{buildroot}%{_bindir}/%{pypi_name}-3
+ln -s %{pypi_name}-3 %{buildroot}%{_bindir}/%{pypi_name}
+
 %if %{without bootstrap}
 mkdir -p %{buildroot}%{python_wheeldir}
 install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
@@ -125,7 +126,6 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
 %files -n python2-%{pypi_name}
 %license LICENSE.txt
 %doc README.rst
-%{_bindir}/%{pypi_name}
 %{_bindir}/%{pypi_name}-2
 %{_bindir}/%{pypi_name}-%{python2_version}
 %{python2_sitelib}/%{pypi_name}*
@@ -134,6 +134,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
 %files -n python3-%{pypi_name}
 %license LICENSE.txt
 %doc README.rst
+%{_bindir}/%{pypi_name}
 %{_bindir}/%{pypi_name}-3
 %{_bindir}/%{pypi_name}-%{python3_version}
 %{python3_sitelib}/%{pypi_name}*
@@ -147,6 +148,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-3 -v --ignore build
 %endif
 
 %changelog
+* 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