From 142460da6538194d50d90f6382ef6fe3940d8bbaac442a7f96c5c62e0fbac8f5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 19 Feb 2017 00:03:19 +0000 Subject: [PATCH] Accepting request 458606 from devel:openSUSE:Factory 1 OBS-URL: https://build.opensuse.org/request/show/458606 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shim-leap?expand=0&rev=3 --- shim-leap.changes | 6 ++++++ shim-leap.spec | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/shim-leap.changes b/shim-leap.changes index 35e9bc3..c870309 100644 --- a/shim-leap.changes +++ b/shim-leap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 17 04:04:36 UTC 2017 - glin@suse.com + +- Support %posttrans with marcos provided by update-bootloader-rpm-macros + package (bsc#997317) (fix from mchang@suse.com) + ------------------------------------------------------------------- Tue Dec 27 05:47:23 UTC 2016 - glin@suse.com diff --git a/shim-leap.spec b/shim-leap.spec index 3c57e20..84fe1a4 100644 --- a/shim-leap.spec +++ b/shim-leap.spec @@ -1,7 +1,7 @@ # # spec file for package shim-leap # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,14 @@ does not exist %package -n shim Summary: UEFI shim loader Group: System/Boot +%if 0%{?suse_version} > 1320 +BuildRequires: update-bootloader-rpm-macros +%endif +%if 0%{?update_bootloader_requires:1} +%update_bootloader_requires +%else Requires: perl-Bootloader +%endif %description -n shim shim is a trivial EFI application that, when run, attempts to open and @@ -48,7 +55,14 @@ rpm2cpio %{SOURCE0} | cpio --extract --unconditional --preserve-modification-tim cp -a * %{buildroot} %post -n shim +%if 0%{?update_bootloader_check_type_reinit_post:1} +%update_bootloader_check_type_reinit_post grub2-efi +%else /sbin/update-bootloader --reinit || true +%endif + +%posttrans -n shim +%{?update_bootloader_posttrans} %files -n shim /etc/uefi