Accepting request 1113901 from home:gary_lin:branches:Base:System

- Only build with fde-tpm-helper-rpm-macros for the architectures
  supporting the newer UEFI and TPM 2.0.
  * Also correct the location of %fde_tpm_update_requires

OBS-URL: https://build.opensuse.org/request/show/1113901
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=464
This commit is contained in:
Michael Chang 2023-09-28 03:04:29 +00:00 committed by Git OBS Bridge
parent ed10ffe1d5
commit cd35f7c278
2 changed files with 16 additions and 4 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 27 03:37:10 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com>
- Only build with fde-tpm-helper-rpm-macros for the architectures
supporting the newer UEFI and TPM 2.0.
* Also correct the location of %fde_tpm_update_requires
-------------------------------------------------------------------
Wed Sep 20 07:54:05 UTC 2023 - Michael Chang <mchang@suse.com>

View File

@ -157,11 +157,18 @@ BuildRequires: update-bootloader-rpm-macros
%endif
%ifarch %{efi}
BuildRequires: fde-tpm-helper-rpm-macros
BuildRequires: grub2-branding
BuildRequires: squashfs
%endif
# For ALP and Tumbleweed
%if 0%{?suse_version} >= 1600
# Only include the macros for the architectures with the newer UEFI and TCG protocol
%ifarch x86_64 aarch64 riscv64
BuildRequires: fde-tpm-helper-rpm-macros
%endif
%endif
Version: 2.12~rc1
Release: 0
Summary: Bootloader with support for Linux, Multiboot and more
@ -445,9 +452,6 @@ Requires(post): %{name} = %{version}
Requires: perl-Bootloader
Requires(post): perl-Bootloader
%endif
%if 0%{?fde_tpm_update_requires:1}
%fde_tpm_update_requires
%endif
%description %{grubarch}
The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
@ -502,6 +506,7 @@ Requires(post): %{name} = %{version}
Requires: perl-Bootloader >= 0.706
Requires(post): perl-Bootloader >= 0.706
%endif
%{?fde_tpm_update_requires}
Provides: %{name}-efi = %{version}-%{release}
Obsoletes: %{name}-efi < %{version}-%{release}