Hello community, here is the log from the commit of package python-pip for openSUSE:Factory checked in at 2020-11-02 09:39:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pip (Old) and /work/SRC/openSUSE:Factory/.python-pip.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pip" Mon Nov 2 09:39:26 2020 rev:50 rq:845027 version:20.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pip/python-pip.changes 2020-10-29 09:48:09.768160063 +0100 +++ /work/SRC/openSUSE:Factory/.python-pip.new.3463/python-pip.changes 2020-11-02 09:39:40.445568512 +0100 @@ -1,0 +2,12 @@ +Fri Oct 30 00:18:04 UTC 2020 - Benjamin Greiner <[email protected]> + +- Make executables setup compatible with multiple python3 flavors + * gh#openSUSE/python-rpm-macros#66 + * update-alternatives for pip3 + * use %python_clone and %python_install_alternative for sip and + sip3 + * use original bin/sip%{python_bin_suffix} as is + * effect: consistent shebangs and specifiers inside the + entry_point scripts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pip.spec ++++++ --- /var/tmp/diff_new_pack.mvHjHt/_old 2020-11-02 09:39:42.013570017 +0100 +++ /var/tmp/diff_new_pack.mvHjHt/_new 2020-11-02 09:39:42.017570021 +0100 @@ -96,7 +96,10 @@ %if ! %{with test} %install %python_install -%prepare_alternative pip +%python_clone -a %{buildroot}%{_bindir}/pip +%python_clone -a %{buildroot}%{_bindir}/pip3 +# if we just cloned to pip3-2.7 delete it +rm -f %{buildroot}%{_bindir}/pip3-2* %python_expand %fdupes %{buildroot}%{$python_sitelib} %endif @@ -121,25 +124,32 @@ # Since /usr/bin/pip became ghosted to be used with update-alternatives, we have to get rid # of the old binary resulting from the non-update-alternatives-ified package: [ -h %{_bindir}/pip ] || rm -f %{_bindir}/pip +[ -h %{_bindir}/pip3 ] || rm -f %{_bindir}/pip3 %post -# can't use `python_install_alternative` because it's pipX.Y, not pip-X.Y -PRIO=$(echo %{python_version} | tr -d .) -%install_alternative pip %{_bindir}/pip%{python_version} $PRIO +# keep the alternative groups separate. Users could decide to let pip and pip3 point to +# different flavors +%python_install_alternative pip +%if "%python_flavor" != "python2" +%python_install_alternative pip3 +%endif %postun -%uninstall_alternative pip %{_bindir}/pip%{python_version} +%python_uninstall_alternative pip +%python_uninstall_alternative pip3 %if ! %{with test} %files %{python_files} %license LICENSE.txt %doc AUTHORS.txt NEWS.rst README.rst -%python3_only %{_bindir}/pip -%{_bindir}/pip%{python_version} -%python2_only %{_bindir}/pip2 -%python3_only %{_bindir}/pip3 -%ghost %{_sysconfdir}/alternatives/pip -%{python_sitelib}/pip-%{version}-py%{python_version}.egg-info +%python_alternative %{_bindir}/pip +%if "%{python_flavor}" == "python2" +%{_bindir}/pip2 +%else +%python_alternative %{_bindir}/pip3 +%endif +%{_bindir}/pip%{python_bin_suffix} +%{python_sitelib}/pip-%{version}*-info %{python_sitelib}/pip %endif
