From eb61541c87ce6d5ab81b94406a5ea2d88012875385dcbd02c0f8678936647c38 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Wed, 31 Jan 2024 11:10:45 +0000 Subject: [PATCH 1/3] Accepting request 1142851 from home:dirkmueller:Factory - avoid the cycle rpm/cmake/crypto-policies/python-rpm-macros: we only need python3-base here, we don't need the python macros as no module is being built OBS-URL: https://build.opensuse.org/request/show/1142851 OBS-URL: https://build.opensuse.org/package/show/security:tls/crypto-policies?expand=0&rev=27 --- crypto-policies.changes | 7 +++++++ crypto-policies.spec | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/crypto-policies.changes b/crypto-policies.changes index 3fac4be..62fe064 100644 --- a/crypto-policies.changes +++ b/crypto-policies.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 30 18:36:34 UTC 2024 - Dirk Müller + +- avoid the cycle rpm/cmake/crypto-policies/python-rpm-macros: + we only need python3-base here, we don't need the python + macros as no module is being built + ------------------------------------------------------------------- Thu Oct 5 12:35:57 UTC 2023 - Daniel Garcia diff --git a/crypto-policies.spec b/crypto-policies.spec index 04930a8..7069e01 100644 --- a/crypto-policies.spec +++ b/crypto-policies.spec @@ -1,7 +1,7 @@ # # spec file for package crypto-policies # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -82,6 +82,9 @@ BuildRequires: perl(File::Copy) BuildRequires: perl(File::Temp) BuildRequires: perl(File::Which) BuildRequires: perl(File::pushd) +%else +# Avoid cycle with python-rpm-macros +#!BuildIgnore: python-rpm-packaging python-rpm-macros %endif %if 0%{?primary_python:1} Recommends: crypto-policies-scripts From b84ddb57d13be1d27e1d0e6d60e0b7b10255eb3ae6716eb5daeb7f69a696e46c Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Wed, 31 Jan 2024 11:56:54 +0000 Subject: [PATCH 2/3] Accepting request 1143007 from home:pmonrealgonzalez:branches:security:tls Revert the previous change OBS-URL: https://build.opensuse.org/request/show/1143007 OBS-URL: https://build.opensuse.org/package/show/security:tls/crypto-policies?expand=0&rev=28 --- crypto-policies.changes | 7 ------- crypto-policies.spec | 3 --- 2 files changed, 10 deletions(-) diff --git a/crypto-policies.changes b/crypto-policies.changes index 62fe064..3fac4be 100644 --- a/crypto-policies.changes +++ b/crypto-policies.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Tue Jan 30 18:36:34 UTC 2024 - Dirk Müller - -- avoid the cycle rpm/cmake/crypto-policies/python-rpm-macros: - we only need python3-base here, we don't need the python - macros as no module is being built - ------------------------------------------------------------------- Thu Oct 5 12:35:57 UTC 2023 - Daniel Garcia diff --git a/crypto-policies.spec b/crypto-policies.spec index 7069e01..cbfd097 100644 --- a/crypto-policies.spec +++ b/crypto-policies.spec @@ -82,9 +82,6 @@ BuildRequires: perl(File::Copy) BuildRequires: perl(File::Temp) BuildRequires: perl(File::Which) BuildRequires: perl(File::pushd) -%else -# Avoid cycle with python-rpm-macros -#!BuildIgnore: python-rpm-packaging python-rpm-macros %endif %if 0%{?primary_python:1} Recommends: crypto-policies-scripts From 88698cf65f784b1ed6fbaa32ee8cb4d17ee1d0d15dc970c8968aea48daaaf803 Mon Sep 17 00:00:00 2001 From: Pedro Monreal Gonzalez Date: Thu, 1 Feb 2024 09:13:03 +0000 Subject: [PATCH 3/3] Accepting request 1143066 from home:dirkmueller:Factory - avoid the cycle rpm/cmake/crypto-policies/python-rpm-macros: we only need python3-base here, we don't need the python macros as no module is being built OBS-URL: https://build.opensuse.org/request/show/1143066 OBS-URL: https://build.opensuse.org/package/show/security:tls/crypto-policies?expand=0&rev=29 --- crypto-policies.changes | 7 +++++++ crypto-policies.spec | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/crypto-policies.changes b/crypto-policies.changes index 3fac4be..62fe064 100644 --- a/crypto-policies.changes +++ b/crypto-policies.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 30 18:36:34 UTC 2024 - Dirk Müller + +- avoid the cycle rpm/cmake/crypto-policies/python-rpm-macros: + we only need python3-base here, we don't need the python + macros as no module is being built + ------------------------------------------------------------------- Thu Oct 5 12:35:57 UTC 2023 - Daniel Garcia diff --git a/crypto-policies.spec b/crypto-policies.spec index cbfd097..03ebdf9 100644 --- a/crypto-policies.spec +++ b/crypto-policies.spec @@ -82,6 +82,9 @@ BuildRequires: perl(File::Copy) BuildRequires: perl(File::Temp) BuildRequires: perl(File::Which) BuildRequires: perl(File::pushd) +%else +# Avoid cycle with python-rpm-macros +#!BuildIgnore: python-rpm-packaging python-rpm-macros %endif %if 0%{?primary_python:1} Recommends: crypto-policies-scripts @@ -180,7 +183,7 @@ done # Fix shebang in scripts for f in %{buildroot}%{_datadir}/crypto-policies/python/* do - [ -f $f ] && sed -i "1s@#!.*python.*@#!$(realpath %__python3)@" $f + [ -f $f ] && sed -i "1s@#!.*python.*@#!$(realpath /usr/bin/python3)@" $f done %py3_compile %{buildroot}%{_datadir}/crypto-policies/python