Rework the .spec to use efi-rpm-macros.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-05-04 15:28:05 -04:00
parent f54022bf7f
commit 3e21f6d5ec
2 changed files with 6 additions and 4 deletions

View File

@ -45,6 +45,7 @@
%{expand:%%package -n shim-%{-a*}} \ %{expand:%%package -n shim-%{-a*}} \
Summary: First-stage UEFI bootloader \ Summary: First-stage UEFI bootloader \
Requires: mokutil >= 1:0.2.0-1 \ Requires: mokutil >= 1:0.2.0-1 \
Requires: efi-filesystem \
Provides: shim-signed-%{-a*} = %{version}-%{release} \ Provides: shim-signed-%{-a*} = %{version}-%{release} \
Requires: dbxtool >= 0.6-3 \ Requires: dbxtool >= 0.6-3 \
%{expand:%%if 0%%{-p*} \ %{expand:%%if 0%%{-p*} \

View File

@ -5,16 +5,17 @@
Name: shim Name: shim
Version: 15 Version: 15
Release: 4.1%{?dist} Release: 5%{?dist}
Summary: First-stage UEFI bootloader Summary: First-stage UEFI bootloader
License: BSD License: BSD
URL: https://github.com/rhboot/shim/ URL: https://github.com/rhboot/shim/
Requires: efi-filesystem BuildRequires: efi-filesystem
BuildRequires: efi-srpm-macros >= 3.2
ExclusiveArch: %{efi} ExclusiveArch: %{efi}
# but we don't build a .i686 package, just a shim-ia32.x86_64 package # but we don't build a .i686 package, just a shim-ia32.x86_64 package
ExcludeArch: %{ix86} ExcludeArch: %{ix86}
# and we don't have shim-unsigned-arm builds yet # and we don't have shim-unsigned-arm builds *yet*
ExcludeArch: %{arm} ExcludeArch: %{arm}
Source0: shim.rpmmacros Source0: shim.rpmmacros
@ -103,7 +104,7 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
%endif %endif
%changelog %changelog
* Fri May 04 2018 Peter Jones <pjones@redhat.com> - 15-4.1 * Fri May 04 2018 Peter Jones <pjones@redhat.com> - 15-5
- Rework the .spec to use efi-rpm-macros. - Rework the .spec to use efi-rpm-macros.
* Fri May 04 2018 Peter Jones <pjones@redhat.com> - 15-4 * Fri May 04 2018 Peter Jones <pjones@redhat.com> - 15-4