#9 Make /usr/bin/wheel Python 3
Merged 2 months ago by churchyard. Opened 2 months ago by churchyard.
rpms/ churchyard/python-wheel the_big_switch  into  master

file modified
+11 -7

@@ -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-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 @@ 

  

  

  %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 @@ 

  %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 @@ 

  %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 @@ 

  %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

  

no initial comment

LGTM. Package upgrades fine

Pull-Request has been merged by churchyard

2 months ago