#9 Ship versioned pathfixX.Y.py in main and non-main Python versions
Merged 3 years ago by churchyard. Opened 3 years ago by lbalhar.
rpms/ lbalhar/python3.7 versioned_pathfix  into  master

file modified
+4 -2
@@ -908,7 +908,7 @@ 

  

  # 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
@@ -982,7 +982,6 @@ 

  # 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
@@ -1003,6 +1002,7 @@ 

  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
@@ -1357,6 +1357,7 @@ 

  %{_bindir}/msgfmt.py

  %endif

  

+ %{_bindir}/pathfix%{pybasever}.py

  %{_bindir}/pygettext%{pybasever}.py

  %{_bindir}/msgfmt%{pybasever}.py

  
@@ -1563,6 +1564,7 @@ 

  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

  

  * Tue Jun 30 2020 Petr Viktorin <pviktori@redhat.com> - 3.7.8-1

  - Update to 3.7.8 final

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.

This change should have no effect here because Python 3.7 is built as a flat package in rawhide but it's nice to have the script there in case somebody tries to build an alternative Python stack.

Build succeeded.

Could you add a changelog entry?

rebased onto dd6421a

3 years ago

rebased onto 4f29c06

3 years ago

rebased onto 6500e7a

3 years ago

I want to avoid the mas rebuild commit jumping in the middle of this, and Koji seem to be quite exhausted, so not waiting for the CI. The change itself was already built fine before. A local mockbuild passed for me just now as well, merging.

Pull-Request has been merged by churchyard

3 years ago

Build succeeded.