From 3d486cb7036979a209c7a140605556ac55a9e862899e4c7b58111a87e88345aa Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 21 Feb 2017 21:47:11 +0000 Subject: [PATCH] Accepting request 459557 from openSUSE:Factory Revert shim-leap OBS-URL: https://build.opensuse.org/request/show/459557 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shim-leap?expand=0&rev=4 --- shim-leap.changes | 6 ------ shim-leap.spec | 16 +--------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/shim-leap.changes b/shim-leap.changes index c870309..35e9bc3 100644 --- a/shim-leap.changes +++ b/shim-leap.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 84fe1a4..3c57e20 100644 --- a/shim-leap.spec +++ b/shim-leap.spec @@ -1,7 +1,7 @@ # # spec file for package shim-leap # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,14 +32,7 @@ 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 @@ -55,14 +48,7 @@ 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