Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python2-pip for openSUSE:Factory 
checked in at 2022-01-10 23:53:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python2-pip (Old)
 and      /work/SRC/openSUSE:Factory/.python2-pip.new.1892 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python2-pip"

Mon Jan 10 23:53:35 2022 rev:3 rq:945327 version:20.0.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/python2-pip/python2-pip.changes  2020-04-22 
20:58:53.576090189 +0200
+++ /work/SRC/openSUSE:Factory/.python2-pip.new.1892/python2-pip.changes        
2022-01-10 23:54:11.180834999 +0100
@@ -1,0 +2,7 @@
+Mon Jan 10 11:01:41 UTC 2022 - Ben Greiner <[email protected]>
+
+- Remove alternatives usage
+- required for fixing boo#1194429: all alternatives providers of
+  /usr/bin/pip need to use the same logic.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python2-pip.spec ++++++
--- /var/tmp/diff_new_pack.NJAjv7/_old  2022-01-10 23:54:11.672835430 +0100
+++ /var/tmp/diff_new_pack.NJAjv7/_new  2022-01-10 23:54:11.676835434 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package python2-pip
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,8 +30,7 @@
 Requires:       ca-certificates
 Requires:       coreutils
 Requires:       python2-setuptools
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(pre):  update-alternatives
 Recommends:     ca-certificates-mozilla
 BuildArch:      noarch
 
@@ -55,21 +54,11 @@
 
 %install
 %python2_install
-
-# update-alternatives
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
-touch %{buildroot}%{_sysconfdir}/alternatives/pip
-ln -sf %{_sysconfdir}/alternatives/pip \
-     %{buildroot}%{_bindir}/pip
-
 %fdupes %{buildroot}%{python2_sitelib}
 
-%post
-# can't use `python_install_alternative` because it's pipX.Y, not pip-X.Y
-%{_sbindir}/update-alternatives --install %{_bindir}/pip \
-    pip %{_bindir}/pip2.7 27
-
-%postun
+%pre
+# remove previous u-a usage early so an update of pip packages for python3 
does not fail
+# boo#1194429
 if [ ! -f %{_bindir}/pip ] ; then
     %{_sbindir}/update-alternatives --remove pip %{_bindir}/pip2.7
 fi
@@ -77,9 +66,8 @@
 %files
 %license LICENSE.txt
 %doc AUTHORS.txt NEWS.rst README.rst
-%ghost %{_sysconfdir}/alternatives/pip
 %{_bindir}/pip%{python2_version}
-%{_bindir}/pip
+%exclude %{_bindir}/pip
 %{_bindir}/pip2
 %{python2_sitelib}/pip-%{version}-py*.egg-info
 %{python2_sitelib}/pip

Reply via email to