From be96b17c8902d6e124f1a08ee6cc283b54c7adb4a9de45de03ba8986088423c8 Mon Sep 17 00:00:00 2001 From: Alberto Planas Dominguez Date: Tue, 23 May 2023 12:36:28 +0000 Subject: [PATCH 1/2] Accepting request 1088652 from home:aplanas:branches:security - Cover ALP via the %{suse_version} macro OBS-URL: https://build.opensuse.org/request/show/1088652 OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-abrmd?expand=0&rev=73 --- tpm2.0-abrmd.changes | 5 +++++ tpm2.0-abrmd.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tpm2.0-abrmd.changes b/tpm2.0-abrmd.changes index 5bc3a60..cb861a8 100644 --- a/tpm2.0-abrmd.changes +++ b/tpm2.0-abrmd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 23 12:31:21 UTC 2023 - Alberto Planas Dominguez + +- Cover ALP via the %{suse_version} macro + ------------------------------------------------------------------- Thu Dec 8 15:07:28 UTC 2022 - Alberto Planas Dominguez diff --git a/tpm2.0-abrmd.spec b/tpm2.0-abrmd.spec index 08a3199..aa28dc0 100644 --- a/tpm2.0-abrmd.spec +++ b/tpm2.0-abrmd.spec @@ -1,7 +1,7 @@ # # spec file for package tpm2.0-abrmd # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +18,9 @@ %global selinuxtype targeted %global modulename tabrmd -# the auto activation is not whitelisted for <= SLE12-SP3 -%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} +# the auto activation is not whitelisted for <= SLE12-SP3 (includes +# ALP in the with %{suse_version} +%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} || 0%{suse_version} >= 1600 %define install_dbus_files 1 %endif # selinux only for Tumbleweed for now From 86346a042347a62317e3c023d2f58d908770f3dd4b8a998f83e29c15b3c475c1 Mon Sep 17 00:00:00 2001 From: Alberto Planas Dominguez Date: Tue, 23 May 2023 13:55:07 +0000 Subject: [PATCH 2/2] Accepting request 1088671 from home:aplanas:branches:security Fix missing ? in macro OBS-URL: https://build.opensuse.org/request/show/1088671 OBS-URL: https://build.opensuse.org/package/show/security/tpm2.0-abrmd?expand=0&rev=74 --- tpm2.0-abrmd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpm2.0-abrmd.spec b/tpm2.0-abrmd.spec index aa28dc0..3062bc9 100644 --- a/tpm2.0-abrmd.spec +++ b/tpm2.0-abrmd.spec @@ -20,7 +20,7 @@ %global modulename tabrmd # the auto activation is not whitelisted for <= SLE12-SP3 (includes # ALP in the with %{suse_version} -%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} || 0%{suse_version} >= 1600 +%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} || 0%{?suse_version} >= 1600 %define install_dbus_files 1 %endif # selinux only for Tumbleweed for now