From 9dddf18b1015d90ef2c0873836d1ea3a60894812 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 30 Jul 2020 22:45:37 -0400
Subject: [PATCH] Try to make kernel and fwupd both work at the same time.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 0012-one-more-glorious-hack.patch | 25 +++++++++++++++++++++++++
 pesign.spec                       |  6 +++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 0012-one-more-glorious-hack.patch

diff --git a/0012-one-more-glorious-hack.patch b/0012-one-more-glorious-hack.patch
new file mode 100644
index 0000000..4ca15ec
--- /dev/null
+++ b/0012-one-more-glorious-hack.patch
@@ -0,0 +1,25 @@
+From ca1fb1982b237aad86ef0adfc2f1a7bc60606701 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Thu, 30 Jul 2020 22:44:11 -0400
+Subject: [PATCH] one more glorious hack
+
+---
+ src/macros.pesign | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/macros.pesign b/src/macros.pesign
+index 730d3bc449c..b4fa04a7192 100644
+--- a/src/macros.pesign
++++ b/src/macros.pesign
+@@ -34,7 +34,7 @@
+     %{?__pesign_cert:--cert %{__pesign_cert}}				\\\
+     %{?vendor:--vendor %{vendor}}					\\\
+     %{?_rhel:--rhelver "%{_rhel}"}					\\\
+-    %{?-n:--rhelcert "%{-n*}"}%{?!-n:--rhelcert "%{__pesign_cert}"}	\\\
++    %{?-n:--rhelcert %{-n*}}%{?!-n:--rhelcert %{__pesign_cert}}		\\\
+     %{?-a:--rhelcafile "%{-a*}"}					\\\
+     %{?-c:--rhelcertfile "%{-c*}"}					\\\
+     %{?-C:--certout "%{-C*}"}						\\\
+-- 
+2.26.2
+
diff --git a/pesign.spec b/pesign.spec
index 2040fab..eb68d02 100644
--- a/pesign.spec
+++ b/pesign.spec
@@ -3,7 +3,7 @@
 Name:    pesign
 Summary: Signing utility for UEFI binaries
 Version: 113
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 URL:     https://github.com/vathpela/pesign
 
@@ -53,6 +53,7 @@ Patch0008: 0008-Move-most-of-macros.pesign-to-pesign-rpmbuild-helper.patch
 Patch0009: 0009-pesign-authorize-shellcheck.patch
 Patch0010: 0010-pesign-authorize-don-t-setfacl-etc-pki-pesign-foo.patch
 Patch0011: 0011-kernel-building-hack.patch
+Patch0012: 0012-one-more-glorious-hack.patch
 
 %description
 This package contains the pesign utility for signing UEFI binaries as
@@ -165,6 +166,9 @@ certutil -d %{_sysconfdir}/pki/pesign/ -X -L > /dev/null
 %{python3_sitelib}/mockbuild/plugins/pesign.*
 
 %changelog
+* Thu Jul 30 2020 Peter Jones <pjones@redhat.com> - 113-12
+- Try to make kernel and fwupd both work at the same time.
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 113-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild