From 3e21f6d5ec5131bc359a5dcbe7dbec2d8c9d35db Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 May 2018 15:28:05 -0400 Subject: [PATCH] Rework the .spec to use efi-rpm-macros. Signed-off-by: Peter Jones --- shim.rpmmacros | 1 + shim.spec | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/shim.rpmmacros b/shim.rpmmacros index 44d23ca..7f16023 100644 --- a/shim.rpmmacros +++ b/shim.rpmmacros @@ -45,6 +45,7 @@ %{expand:%%package -n shim-%{-a*}} \ Summary: First-stage UEFI bootloader \ Requires: mokutil >= 1:0.2.0-1 \ +Requires: efi-filesystem \ Provides: shim-signed-%{-a*} = %{version}-%{release} \ Requires: dbxtool >= 0.6-3 \ %{expand:%%if 0%%{-p*} \ diff --git a/shim.spec b/shim.spec index 2d4a972..a6da245 100644 --- a/shim.spec +++ b/shim.spec @@ -5,16 +5,17 @@ Name: shim Version: 15 -Release: 4.1%{?dist} +Release: 5%{?dist} Summary: First-stage UEFI bootloader License: BSD URL: https://github.com/rhboot/shim/ -Requires: efi-filesystem +BuildRequires: efi-filesystem +BuildRequires: efi-srpm-macros >= 3.2 ExclusiveArch: %{efi} # but we don't build a .i686 package, just a shim-ia32.x86_64 package ExcludeArch: %{ix86} -# and we don't have shim-unsigned-arm builds yet +# and we don't have shim-unsigned-arm builds *yet* ExcludeArch: %{arm} Source0: shim.rpmmacros @@ -103,7 +104,7 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi %endif %changelog -* Fri May 04 2018 Peter Jones - 15-4.1 +* Fri May 04 2018 Peter Jones - 15-5 - Rework the .spec to use efi-rpm-macros. * Fri May 04 2018 Peter Jones - 15-4