Make macros.pesign more reliable

pesign-0.10-better-macros.patch

@@ -0,0 +1,27 @@
+From 1caa864e41ebd26a2289bf69d44183e88b76b207 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 14 Aug 2012 11:52:29 -0400
+Subject: [PATCH] Make macros.pesign work a bit better.
+
+---
+ src/macros.pesign | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/macros.pesign b/src/macros.pesign
+index d12ad05..beb6489 100644
+--- a/src/macros.pesign
++++ b/src/macros.pesign
+@@ -6,8 +6,8 @@
+ # %pesign -s -i shim.orig -o shim.efi
+ # And magically get the right thing.
+ 
+-%__pesign_token %{expand: %%{?defined(pe_signing_token):%{nil}}%%{!?defined(pe_signing_token):-t "%%{pe_signing_token}"}}
+-%__pesign_cert %{expand: %%{?defined(pe_signing_cert):%{nil}}%%{!?defined(pe_signing_cert):-c "%%{pe_signing_cert}"}}
++%__pesign_token %{expand: %%{nil} %%{?pe_signing_token:-t "%%{pe_signing_token}"}}
++%__pesign_cert %{expand: %%{!?pe_signing_cert:-c "Red Hat Test Certificate"} %%{?pe_signing_cert:-c "%%{pe_signing_cert}"}}
+ 
+ %_pesign /usr/bin/pesign
+ %pesign \
+-- 
+1.7.11.4
+

pesign.spec

@@ -1,7 +1,7 @@
 Summary: Signing utility for UEFI binaries
 Name: pesign
 Version: 0.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/System
 License: GPLv2
 URL: https://github.com/vathpela/pesign
@@ -16,6 +16,8 @@ ExclusiveArch: i686 x86_64 ia64
 Source0: pesign-%{version}.tar.bz2
 Source1: rh-test-certs.tar.bz2
 
+Patch0:	pesign-0.10-better-macros.patch
+
 %description
 This package contains the pesign utility for signing UEFI binaries as
 well as other associated tools.
@@ -55,6 +57,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) /etc/pki/pesign/*
 
 %changelog
+* Tue Aug 14 2012 Peter Jones <pjones@redhat.com> - 0.10-2
+- Make macros.pesign more reliable
+
 * Mon Aug 13 2012 Peter Jones <pjones@redhat.com> - 0.10-1
 - Update to 0.10
 - Include rpm macros to support easy custom signing of signed packages.