From f5bd688043e584d9b51e999a0ac54ad03bcd32da Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Jul 31 2020 05:38:58 +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/python38.spec b/python38.spec
index 596d334..45e1fc8 100644
--- a/python38.spec
+++ b/python38.spec
@@ -17,7 +17,7 @@ URL: https://www.python.org/
 #global prerel rc1
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Python
 
 
@@ -902,7 +902,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
@@ -980,7 +980,6 @@ mv %{buildroot}%{_bindir}/2to3-%{pybasever} %{buildroot}%{_bindir}/2to3
 # 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
@@ -1001,6 +1000,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
@@ -1376,6 +1376,7 @@ CheckPython optimized
 %{_bindir}/msgfmt.py
 %endif
 
+%{_bindir}/pathfix%{pybasever}.py
 %{_bindir}/pygettext%{pybasever}.py
 %{_bindir}/msgfmt%{pybasever}.py
 
@@ -1591,6 +1592,9 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Fri Jul 31 2020 Lumír Balhar <lbalhar@redhat.com> - 3.8.5-2
+- Ship versioned pathfixX.Y.py in main and non-main Python versions
+
 * Mon Jul 20 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8.5-1
 - Update to 3.8.5