From 82f6e5771829783c43e5f5547ea0b42cf16eaa53 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 24 Aug 2021 22:39:32 +0000 Subject: [PATCH] import python3-3.6.8-40.el8 --- SPECS/python3.spec | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/SPECS/python3.spec b/SPECS/python3.spec index 2b7dfa0..c9c412a 100644 --- a/SPECS/python3.spec +++ b/SPECS/python3.spec @@ -14,7 +14,7 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well Version: %{pybasever}.8 -Release: 39%{?dist} +Release: 40%{?dist} License: Python @@ -656,10 +656,10 @@ Requires: python3-setuptools-wheel Requires: python3-pip-wheel %endif -# Runtime require alternatives -Requires: %{_sbindir}/alternatives -Requires(post): %{_sbindir}/alternatives -Requires(postun): %{_sbindir}/alternatives +# Require alternatives version that implements the --keep-foreign flag +Requires: alternatives >= 1.19.1-1 +Requires(post): alternatives >= 1.19.1-1 +Requires(postun): alternatives >= 1.19.1-1 # This prevents ALL subpackages built from this spec to require # /usr/bin/python3*. Granularity per subpackage is impossible. @@ -800,6 +800,9 @@ Provides: %{name}-tools = %{version}-%{release} Provides: %{name}-tools%{?_isa} = %{version}-%{release} Obsoletes: %{name}-tools < %{version}-%{release} + +# Require alternatives version that implements the --keep-foreign flag +Requires(postun): alternatives >= 1.19.1-1 # python36 installs the alternatives master symlink to which we attach a slave Requires: python36 Requires(post): python36 @@ -1407,7 +1410,7 @@ alternatives --install %{_bindir}/unversioned-python \ %postun -n platform-python # Do this only during uninstall process (not during update) if [ $1 -eq 0 ]; then - alternatives --remove python \ + alternatives --keep-foreign --remove python \ %{_libexecdir}/no-python fi @@ -1422,7 +1425,7 @@ alternatives --add-slave python3 %{_bindir}/python3.6 \ %postun -n python3-idle # Do this only during uninstall process (not during update) if [ $1 -eq 0 ]; then - alternatives --remove-slave python3 %{_bindir}/python3.6 \ + alternatives --keep-foreign --remove-slave python3 %{_bindir}/python3.6 \ idle3 fi @@ -1865,6 +1868,10 @@ fi # ====================================================== %changelog +* Thu Jul 29 2021 Tomas Orsava - 3.6.8-40 +- Adjusted the postun scriptlets to enable upgrading to RHEL 9 +- Resolves: rhbz#1933055 + * Fri Jul 09 2021 Victor Stinner - 3.6.8-39 - Fix reentrant call to threading.enumerate() (rhbz#1959459) - Don't exit Python with abort() when a thread exit and there is no available