From 4af5b3f4d47469270e2f18fa179a68b0537bdf32d6feda63b098500e2c4c37fb Mon Sep 17 00:00:00 2001 From: Joey Lee Date: Tue, 2 Apr 2024 04:26:58 +0000 Subject: [PATCH] Accepting request 1164001 from home:gary_lin:branches:devel:openSUSE:Factory - Introduce %shim_use_fde_tpm_helper macro so that the project can include the fde-tpm-helper-macros for the build targets other than Tumbleweed OBS-URL: https://build.opensuse.org/request/show/1164001 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=212 --- shim.changes | 7 +++++++ shim.spec | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/shim.changes b/shim.changes index 0209e76..9c23b29 100644 --- a/shim.changes +++ b/shim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 2 03:09:15 UTC 2024 - Gary Ching-Pang Lin + +- Introduce %shim_use_fde_tpm_helper macro so that the project + can include the fde-tpm-helper-macros for the build targets + other than Tumbleweed + ------------------------------------------------------------------- Mon Feb 26 13:09:29 UTC 2024 - Dominique Leuenberger diff --git a/shim.spec b/shim.spec index bcfdd14..127cbdd 100644 --- a/shim.spec +++ b/shim.spec @@ -35,6 +35,10 @@ %endif %endif +%if 0%{?suse_version} >= 1600 +%define shim_use_fde_tpm_helper 1 +%endif + Name: shim Version: 15.8 Release: 0 @@ -89,7 +93,7 @@ BuildRequires: mozilla-nss-tools BuildRequires: openssl >= 0.9.8 BuildRequires: pesign BuildRequires: pesign-obs-integration -%if 0%{?suse_version} >= 1600 +%if 0%{?shim_use_fde_tpm_helper:1} BuildRequires: fde-tpm-helper-rpm-macros %endif %if 0%{?suse_version} > 1320