From 8daf777a4851ddd2e6f63328e3fcf2f00c00031435a5ac8408e0dcfdbf798270 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 29 Nov 2021 21:16:35 +0000 Subject: [PATCH 1/2] - 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 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python38?expand=0&rev=82 --- python38.changes | 10 ++++++++++ python38.spec | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/python38.changes b/python38.changes index d6a3402..9984be6 100644 --- a/python38.changes +++ b/python38.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 Oct 12 12:22:53 UTC 2021 - Dominique Leuenberger diff --git a/python38.spec b/python38.spec index fa921ef..f3b2a3c 100644 --- a/python38.spec +++ b/python38.spec @@ -426,6 +426,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 @@ -434,6 +435,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 From e80a36de5591ce539b3a79064cda9bfd0f79c6ee11ec65f766f67875dfd0f78a Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 29 Nov 2021 21:18:48 +0000 Subject: [PATCH 2/2] Run spec-cleaner OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python38?expand=0&rev=83 --- python38.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python38.spec b/python38.spec index f3b2a3c..9b8e368 100644 --- a/python38.spec +++ b/python38.spec @@ -123,13 +123,13 @@ Patch02: F00251-change-user-install-location.patch # PATCH-FEATURE-UPSTREAM SUSE-FEDORA-multilib.patch bsc#[0-9]+ mcepl@suse.com # Add support for platlib variable Patch03: SUSE-FEDORA-multilib.patch -# PATCH-FEATURE-UPSTREAM distutils-reproducible-compile.patch gh#python/cpython#8057 mcepl@suse.com -# Improve reproduceability -Patch06: distutils-reproducible-compile.patch # PATCH-FEATURE-UPSTREAM decimal-3.8.patch bsc#1189356 mcepl@suse.com # fix building with mpdecimal # https://www.bytereef.org/contrib/decimal-3.8.diff Patch05: decimal-3.8.patch +# PATCH-FEATURE-UPSTREAM distutils-reproducible-compile.patch gh#python/cpython#8057 mcepl@suse.com +# Improve reproduceability +Patch06: distutils-reproducible-compile.patch # support finding packages in /usr/local, install to /usr/local by default Patch07: python-3.3.0b1-localpath.patch # replace DATE, TIME and COMPILER by fixed definitions to aid reproducible builds