[shim/f18: 3/3] Continue making /boot/.../shim.efi for now until shim-signed is ready.

[Peter Jones]

commit aee33f1b0de8c4da3c0aececeae41552bc38b1b9
Author: Peter Jones <pjones at redhat.com>
Date:   Mon Oct 22 11:08:19 2012 -0400

    Continue making /boot/.../shim.efi for now until shim-signed is ready.
    
    Signed-off-by: Peter Jones <pjones at redhat.com>

 shim.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/shim.spec b/shim.spec
index 655742b..272cee3 100644
--- a/shim.spec
+++ b/shim.spec
@@ -9,7 +9,7 @@ Source0:        http://www.codon.org.uk/~mjg59/shim/shim-%{version}.tar.bz2
 Source1:	fedora-ca.cer
 
 BuildRequires: gnu-efi git
-BuildRequires: pesign >= 0.99-6
+BuildRequires: pesign >= 0.99-8
 
 # Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI is not
 # compatible with SysV (there's no red zone under UEFI) and there isn't a
@@ -56,7 +56,7 @@ git am %{patches} </dev/null
 %build
 %define vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
 %define vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
-pesign %{vendor_token_str} %{vendor_cert_str} -C vendor.cer
+#pesign %{vendor_token_str} %{vendor_cert_str} -C vendor.cer
 
 MAKEFLAGS=""
 if [ -f "%{SOURCE1}" ]; then
@@ -71,11 +71,14 @@ rm -rf $RPM_BUILD_ROOT
 install -D -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/shim/
 install -m 0644 shim.efi $RPM_BUILD_ROOT%{_datadir}/shim/shim.efi
 install -m 0644 shim.sig $RPM_BUILD_ROOT%{_datadir}/shim/shim.sig
+install -D -d -m 0755 RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
+%pesign -s -i shim.efi -o RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
 
 %files -n shim-unsigned
 %doc
 %dir %{_datadir}/shim
 %{_datadir}/shim/*
+/boot/efi/EFI/%{efidir}/shim.efi
 
 %changelog
 * Thu Oct 18 2012 Peter Jones <pjones at redhat.com>