From 23703df79aaadd25ecde005b74bdce493d0e696e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 14 2021 08:22:59 +0000
Subject: import python2-2.7.18-3.module+el8.4.0+9442+27d0e81c


---

diff --git a/SPECS/python2.spec b/SPECS/python2.spec
index 09ff21a..190aea9 100644
--- a/SPECS/python2.spec
+++ b/SPECS/python2.spec
@@ -104,7 +104,7 @@ Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 # Remember to also rebase python2-docs when changing this:
 Version: 2.7.18
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Python
 Group: Development/Languages
 Requires: %{python}-libs%{?_isa} = %{version}-%{release}
@@ -173,9 +173,9 @@ BuildRequires: python2-pip-wheel
 %endif
 
 # Runtime require alternatives
-Requires:         %{_sbindir}/alternatives
-Requires(post):   %{_sbindir}/alternatives
-Requires(postun): %{_sbindir}/alternatives
+Requires:         /usr/sbin/alternatives
+Requires(post):   /usr/sbin/alternatives
+Requires(postun): /usr/sbin/alternatives
 
 # Previously, this was required for our rewheel patch to work.
 # This is technically no longer needed, but we keep it recommended
@@ -808,7 +808,16 @@ Requires: python3-rpm-generators
 # installed when -devel is required.
 # See https://bugzilla.redhat.com/show_bug.cgi?id=1623922
 # See https://fedoraproject.org/wiki/Packaging:Directory_Replacement
+#
+# This is not necessary when rebuilding when we're bundling the python2 stack
+# into a Flatpak containe with prefix=/app, because we never upgrade packages
+# in the Flatpak context. We want to avoid
+# python2-setuptools => BuildRequires => python2-devel => Requires python2-setuptools
+# since the old python2-setuptools will be the /usr version not the /app version.
+
+%if !0%{?flatpak}
 Requires: python2-setuptools
+%endif
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1217376
 # https://bugzilla.redhat.com/show_bug.cgi?id=1496757
@@ -1219,7 +1228,7 @@ make install DESTDIR=%{buildroot}
 # but doing so generated noise when ldconfig was rerun (rhbz:562980)
 #
 %if 0%{?with_gdb_hooks}
-DirHoldingGdbPy=%{_prefix}/lib/debug/%{_libdir}
+DirHoldingGdbPy=%{_usr}/lib/debug/%{_libdir}
 PathOfGdbPy=$DirHoldingGdbPy/$PyInstSoName-%{version}-%{release}.%{_arch}.debug-gdb.py
 
 mkdir -p %{buildroot}$DirHoldingGdbPy
@@ -1591,10 +1600,10 @@ fi
 %{_bindir}/pydoc2*
 %{_bindir}/%{python}
 %{_bindir}/python%{pybasever}
-%{_mandir}/man1/python2.1.gz
-%{_mandir}/man1/python2.7.1.gz
+%{_mandir}/man1/python2.1*
+%{_mandir}/man1/python2.7.1*
 %ghost %{_bindir}/unversioned-python
-%ghost %{_mandir}/man1/python.1.gz
+%ghost %{_mandir}/man1/python.1*
 
 
 %files libs
@@ -1963,6 +1972,10 @@ fi
 # ======================================================
 
 %changelog
+* Wed Jan 13 2021 Charalampos Stratakis <cstratak@redhat.com> - 2.7.18-3
+- Fixes for bundling prefix=/app build in gimp/inkscape containers
+Resolves: rhbz#1907592
+
 * Fri Oct 09 2020 Charalampos Stratakis <cstratak@redhat.com> - 2.7.18-2
 - Security fix for CVE-2020-26116: Reject control chars in HTTP method in httplib.putrequest
 Resolves: rhbz#1883258