| |
@@ -17,7 +17,7 @@
|
| |
#global prerel rc1
|
| |
%global upstream_version %{general_version}%{?prerel}
|
| |
Version: %{general_version}%{?prerel:~%{prerel}}
|
| |
- Release: 2%{?dist}
|
| |
+ Release: 3%{?dist}
|
| |
License: Python
|
| |
|
| |
|
| |
@@ -925,7 +925,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
|
| |
@@ -1007,7 +1007,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
|
| |
@@ -1028,6 +1027,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
|
| |
@@ -1394,6 +1394,7 @@
|
| |
%{_bindir}/msgfmt.py
|
| |
%endif
|
| |
|
| |
+ %{_bindir}/pathfix%{pybasever}.py
|
| |
%{_bindir}/pygettext%{pybasever}.py
|
| |
%{_bindir}/msgfmt%{pybasever}.py
|
| |
|
| |
@@ -1609,6 +1610,9 @@
|
| |
# ======================================================
|
| |
|
| |
%changelog
|
| |
+ * Wed Jul 29 2020 Lumír Balhar <lbalhar@redhat.com> - 3.8.5-3
|
| |
+ - Ship versioned pathfixX.Y.py in main and non-main Python versions
|
| |
+
|
| |
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.5-2
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
| |
|
| |
lbalhar
commented 3 years ago
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.8 is built as a flat package in rawhide but it's nice to have the script there in case somebody try to build an alternative Python stack.