From 5e429b6d7c0e8493dab92cfd1a8bca7fedfaa5c3 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Jul 28 2020 17:10:17 +0000
Subject: Ship versioned pathfixX.Y.py in main and non-main Python versions


pathfix.py is a cruicial tool when building Python so it's
useful to have it also in non-main Pythons without a conflict
with the main one.

---

diff --git a/python3.spec b/python3.spec
index 6583137..665fec8 100644
--- a/python3.spec
+++ b/python3.spec
@@ -918,7 +918,7 @@ sed -i -e "s/'pyconfig.h'/'%{_pyconfig_h}'/" \
 
 # Install pathfix.py to bindir
 # See https://github.com/fedora-python/python-rpm-porting/issues/24
-cp -p Tools/scripts/pathfix.py %{buildroot}%{_bindir}/
+cp -p Tools/scripts/pathfix.py %{buildroot}%{_bindir}/pathfix%{pybasever}.py
 
 # Install i18n tools to bindir
 # They are also in python2, so we version them
@@ -992,7 +992,6 @@ ln -s ./python%{pybasever}.1 %{buildroot}%{_mandir}/man1/python%{pybasever}m.1
 # Remove stuff that would conflict with python3 package
 rm %{buildroot}%{_bindir}/python3
 rm %{buildroot}%{_bindir}/pydoc3
-rm %{buildroot}%{_bindir}/pathfix.py
 rm %{buildroot}%{_bindir}/pygettext3.py
 rm %{buildroot}%{_bindir}/msgfmt3.py
 rm %{buildroot}%{_bindir}/idle3
@@ -1013,6 +1012,7 @@ ln -s ./idle3 %{buildroot}%{_bindir}/idle
 ln -s ./python3-config %{buildroot}%{_bindir}/python-config
 ln -s ./python3.1 %{buildroot}%{_mandir}/man1/python.1
 ln -s ./python3.pc %{buildroot}%{_libdir}/pkgconfig/python.pc
+ln -s ./pathfix%{pybasever}.py %{buildroot}%{_bindir}/pathfix.py
 %if %{with debug_build}
 ln -s ./python3-debug %{buildroot}%{_bindir}/python-debug
 %endif
@@ -1367,6 +1367,7 @@ CheckPython optimized
 %{_bindir}/msgfmt.py
 %endif
 
+%{_bindir}/pathfix%{pybasever}.py
 %{_bindir}/pygettext%{pybasever}.py
 %{_bindir}/msgfmt%{pybasever}.py
 
@@ -1573,6 +1574,7 @@ CheckPython optimized
 Resolves: rhbz#1856481
 - Resolve hash collisions for Pv4Interface and IPv6Interface (CVE-2020-14422)
 Resolves: rhbz#1854926
+- Ship versioned pathfixX.Y.py in main and non-main Python versions
 
 * Wed Jul 01 2020 Petr Viktorin <pviktori@redhat.com> - 3.7.8-1
 - Update to 3.7.8 final