From 2dad11ae4d620db9541a280e2c14248613f592587f78891d66b7a01c8f1f7030 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 2 Mar 2022 00:59:44 +0000 Subject: [PATCH] - Recover again proper value of %python2_package_prefix (bsc#1175619). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=320 --- python-base.changes | 2 ++ python-base.spec | 14 ++++++++------ python-doc.changes | 2 ++ python.changes | 2 ++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/python-base.changes b/python-base.changes index 0c3851b..7361bcc 100644 --- a/python-base.changes +++ b/python-base.changes @@ -3,6 +3,8 @@ Sat Feb 26 12:41:42 UTC 2022 - Matej Cepl - Update bundled pip wheel to the latest SLE version patched against bsc#1186819 (CVE-2021-3572). +- Recover again proper value of %python2_package_prefix + (bsc#1175619). ------------------------------------------------------------------- Fri Feb 18 11:00:25 UTC 2022 - Matej Cepl diff --git a/python-base.spec b/python-base.spec index bc2dbd8..fe629e8 100644 --- a/python-base.spec +++ b/python-base.spec @@ -284,6 +284,13 @@ sed -i -e "s/^\(\s*_SETUPTOOLS_VERSION\s\+=\s\+\)\"[0-9.]\+\"/\1\"${STVER}\"/" \ -e "s/^\(\s*_PIP_VERSION\s\+=\s\+\)\"[0-9.]\+\"/\1\"${PIPVER}\"/" \ Lib/ensurepip/__init__.py +cp -p %{SOURCE1} macros.python2 +%if %{suse_version} < 1500 +# on SLE12 and SLE11 the python2 modules will still be called python-xxxx +# as this SPEC file is used on SLE12, keep it in here for the time being +sed -i -e 's/python2_package_prefix python2/python2_package_prefix python/' macros.python2 +%endif + %build %define _lto_cflags %{nil} export OPT="%{optflags} -DOPENSSL_LOAD_CONF -fwrapv" @@ -377,12 +384,7 @@ find . -name '*.py' -type f | grep -vE "^./Parser/|^./Python/" \ %make_install OPT="%{optflags} -fPIC" install -m 644 %{SOURCE5} %{buildroot}%{_libdir}/python%{python_version}/site-packages/_local.pth install -d -m 755 %{buildroot}%{_rpmconfigdir}/macros.d/ -install -m 644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/ -%if %{suse_version} < 1500 -# on SLE12 and SLE11 the python2 modules will still be called python-xxxx -# as this SPEC file is used on SLE12, keep it in here for the time being -sed -i -e 's/python2_package_prefix python2/python2_package_prefix python/;' %{buildroot}%{_rpmconfigdir}/macros.d/macros.python2 -%endif +install -m 644 macros.python2 %{buildroot}%{_rpmconfigdir}/macros.d/ # make sure /usr/lib/python/site-packages exists even on lib64 machines mkdir -p %{buildroot}%{_prefix}/lib/python%{python_version}/site-packages diff --git a/python-doc.changes b/python-doc.changes index 0c3851b..7361bcc 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -3,6 +3,8 @@ Sat Feb 26 12:41:42 UTC 2022 - Matej Cepl - Update bundled pip wheel to the latest SLE version patched against bsc#1186819 (CVE-2021-3572). +- Recover again proper value of %python2_package_prefix + (bsc#1175619). ------------------------------------------------------------------- Fri Feb 18 11:00:25 UTC 2022 - Matej Cepl diff --git a/python.changes b/python.changes index 0c3851b..7361bcc 100644 --- a/python.changes +++ b/python.changes @@ -3,6 +3,8 @@ Sat Feb 26 12:41:42 UTC 2022 - Matej Cepl - Update bundled pip wheel to the latest SLE version patched against bsc#1186819 (CVE-2021-3572). +- Recover again proper value of %python2_package_prefix + (bsc#1175619). ------------------------------------------------------------------- Fri Feb 18 11:00:25 UTC 2022 - Matej Cepl