Add /usr/bin/pygettext3.py and msgfmt3.py to python3-devel

Resolves: rhbz#1571474
This commit is contained in:
Miro Hrončok 2018-07-26 13:44:49 +02:00
parent 4aa9ebcc03
commit 83a5f52678
2 changed files with 25 additions and 1 deletions

View File

@ -7,6 +7,10 @@ import sys
# list of test and other files that we expect not to have bytecode # list of test and other files that we expect not to have bytecode
not_compiled = [ not_compiled = [
'/usr/bin/pathfix.py', '/usr/bin/pathfix.py',
'/usr/bin/pygettext3.py',
f'/usr/bin/pygettext{sys.version[:3]}.py',
'/usr/bin/msgfmt3.py',
f'/usr/bin/msgfmt{sys.version[:3]}.py',
'test/bad_coding.py', 'test/bad_coding.py',
'test/bad_coding2.py', 'test/bad_coding2.py',
'test/badsyntax_3131.py', 'test/badsyntax_3131.py',

View File

@ -14,7 +14,7 @@ URL: https://www.python.org/
# WARNING When rebasing to a new Python version, # WARNING When rebasing to a new Python version,
# remember to update the python3-docs package as well # remember to update the python3-docs package as well
Version: %{pybasever}.0 Version: %{pybasever}.0
Release: 7%{?dist} Release: 8%{?dist}
License: Python License: Python
@ -893,6 +893,14 @@ sed -i -e "s/'pyconfig.h'/'%{_pyconfig_h}'/" \
# See https://github.com/fedora-python/python-rpm-porting/issues/24 # 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}/
# Install i18n tools to bindir
# They are also in python2, so we version them
# https://bugzilla.redhat.com/show_bug.cgi?id=1571474
for tool in pygettext msgfmt; do
cp -p Tools/i18n/${tool}.py %{buildroot}%{_bindir}/${tool}%{pybasever}.py
ln -s ${tool}%{pybasever}.py %{buildroot}%{_bindir}/${tool}3.py
done
# Switch all shebangs to refer to the specific Python version. # Switch all shebangs to refer to the specific Python version.
# This currently only covers files matching ^[a-zA-Z0-9_]+\.py$, # This currently only covers files matching ^[a-zA-Z0-9_]+\.py$,
# so handle files named using other naming scheme separately. # so handle files named using other naming scheme separately.
@ -900,6 +908,7 @@ LD_LIBRARY_PATH=./build/optimized ./build/optimized/python \
Tools/scripts/pathfix.py \ Tools/scripts/pathfix.py \
-i "%{_bindir}/python%{pybasever}" -pn \ -i "%{_bindir}/python%{pybasever}" -pn \
%{buildroot} \ %{buildroot} \
%{buildroot}%{_bindir}/*%{pybasever}.py \
%{?with_gdb_hooks:%{buildroot}$DirHoldingGdbPy/*.py} %{?with_gdb_hooks:%{buildroot}$DirHoldingGdbPy/*.py}
# Remove tests for python3-tools which was removed in # Remove tests for python3-tools which was removed in
@ -964,6 +973,8 @@ mv %{buildroot}%{_bindir}/2to3-%{pybasever} %{buildroot}%{_bindir}/2to3
rm %{buildroot}%{_bindir}/python3 rm %{buildroot}%{_bindir}/python3
rm %{buildroot}%{_bindir}/pydoc3 rm %{buildroot}%{_bindir}/pydoc3
rm %{buildroot}%{_bindir}/pathfix.py rm %{buildroot}%{_bindir}/pathfix.py
rm %{buildroot}%{_bindir}/pygettext3.py
rm %{buildroot}%{_bindir}/msgfmt3.py
rm %{buildroot}%{_bindir}/idle3 rm %{buildroot}%{_bindir}/idle3
rm %{buildroot}%{_bindir}/python3-* rm %{buildroot}%{_bindir}/python3-*
rm %{buildroot}%{_bindir}/pyvenv rm %{buildroot}%{_bindir}/pyvenv
@ -1328,8 +1339,13 @@ CheckPython optimized
%{_bindir}/python3-config %{_bindir}/python3-config
%{_libdir}/pkgconfig/python3.pc %{_libdir}/pkgconfig/python3.pc
%{_bindir}/pathfix.py %{_bindir}/pathfix.py
%{_bindir}/pygettext3.py
%{_bindir}/msgfmt3.py
%endif %endif
%{_bindir}/pygettext%{pybasever}.py
%{_bindir}/msgfmt%{pybasever}.py
%{_bindir}/python%{pybasever}-config %{_bindir}/python%{pybasever}-config
%{_bindir}/python%{LDVERSION_optimized}-config %{_bindir}/python%{LDVERSION_optimized}-config
%{_bindir}/python%{LDVERSION_optimized}-*-config %{_bindir}/python%{LDVERSION_optimized}-*-config
@ -1528,6 +1544,10 @@ CheckPython optimized
# ====================================================== # ======================================================
%changelog %changelog
* Fri Aug 17 2018 Miro Hrončok <mhroncok@redhat.com> - 3.7.0-8
- Add /usr/bin/pygettext3.py and msgfmt3.py to python3-devel
Resolves: rhbz#1571474
* Fri Aug 17 2018 Miro Hrončok <mhroncok@redhat.com> - 3.7.0-7 * Fri Aug 17 2018 Miro Hrončok <mhroncok@redhat.com> - 3.7.0-7
- Backport TLS 1.3 related fixes to fix FTBFS - Backport TLS 1.3 related fixes to fix FTBFS
Resolves: rhbz#1609291 Resolves: rhbz#1609291