From b32fd43b74fc460f70871890ae29ff23665fce65677b838d18e8fb809f7f285f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 30 Jan 2025 12:53:34 +0000 Subject: [PATCH] Accepting request 1240509 from home:dgarcia:branches:devel:languages:python:Factory - Configure externally_managed with a bcond https://en.opensuse.org/openSUSE:Python:Externally_managed bsc#1228165 OBS-URL: https://build.opensuse.org/request/show/1240509 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python311?expand=0&rev=156 --- python311.changes | 7 +++++++ python311.spec | 14 +++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/python311.changes b/python311.changes index ead203e..2f977cc 100644 --- a/python311.changes +++ b/python311.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 27 09:00:48 UTC 2025 - Daniel Garcia + +- Configure externally_managed with a bcond + https://en.opensuse.org/openSUSE:Python:Externally_managed + bsc#1228165 + ------------------------------------------------------------------- Wed Dec 4 21:40:41 UTC 2024 - Matej Cepl diff --git a/python311.spec b/python311.spec index 9a0cc4b..3896850 100644 --- a/python311.spec +++ b/python311.spec @@ -1,7 +1,7 @@ # # spec file for package python311 # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,6 +42,14 @@ %bcond_with profileopt %endif +# Only for Tumbleweed +# https://en.opensuse.org/openSUSE:Python:Externally_managed +%if 0%{?suse_version} > 1600 +%bcond_without externally_managed +%else +%bcond_with externally_managed +%endif + %define python_pkg_name python311 %if "%{python_pkg_name}" == "%{primary_python}" %define primary_interpreter 1 @@ -726,7 +734,7 @@ rm %{buildroot}%{_libdir}/libpython3.so rm %{buildroot}%{_libdir}/pkgconfig/{python3,python3-embed}.pc %endif -%if %{suse_version} > 1550 +%if %{with externally_managed} # PEP-0668 mark this as a distro maintained python sed -e 's,__PYTHONPREFIX__,%{python_pkg_name},' -e 's,__PYTHON__,python%{python_version},' < %{SOURCE4} > %{buildroot}%{sitedir}/EXTERNALLY-MANAGED %endif @@ -922,7 +930,7 @@ fi %{_mandir}/man1/python3.1%{?ext_man} %endif %{_mandir}/man1/python%{python_version}.1%{?ext_man} -%if 0%{?suse_version} > 1550 +%if %{with externally_managed} # PEP-0668 %{sitedir}/EXTERNALLY-MANAGED %endif