diff --git a/python310.changes b/python310.changes index 00fa200..96ec5e7 100644 --- a/python310.changes +++ b/python310.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Nov 29 00:17:07 UTC 2021 - Matej Cepl + +- Remove shebangs from from python-base libraries in _libdir + (bsc#1193179). +- Readjust patches: + - bpo-31046_ensurepip_honours_prefix.patch + - decimal.patch + - python-3.3.0b1-fix_date_time_compiler.patch + ------------------------------------------------------------------- Tue Nov 16 16:03:43 UTC 2021 - Matej Cepl diff --git a/python310.spec b/python310.spec index 587fde4..1ebc903 100644 --- a/python310.spec +++ b/python310.spec @@ -402,6 +402,7 @@ other applications. # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac +%if %{primary_interpreter} # fix shebangs - convert /usr/local/bin/python and /usr/bin/env/python to /usr/bin/python3 for dir in Lib Tools; do # find *.py, filter to files that contain bad shebangs @@ -410,6 +411,13 @@ for dir in Lib Tools; do | xargs -0 grep -lE '^#! *(/''usr/.*bin/(env +)?)?python' \ | xargs sed -r -i -e '1s@^#![[:space:]]*(/''usr/(local/)?bin/(env +)?)?python([0-9]+(\.[0-9]+)?)?@#!%{_bindir}/python3@' done +%else +# For non-primary Python, just don't bother (bsc#1193179) and remove all +# those shebangs +for dir in Lib Tools; do + find $dir -name '*.py' -type f -exec sed -i '1{/^#!.*python/ d}' '{}' \; +done +%endif # drop in-tree libffi and expat rm -r Modules/_ctypes/libffi* Modules/_ctypes/darwin