From c99a982eafe7e19cfe0e1ce729044513d95cfc97 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 13 Jul 2020 19:27:19 -0400
Subject: [PATCH] Test builders again again

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 pesign-test-app.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pesign-test-app.spec b/pesign-test-app.spec
index d6b20ee..3fb5b09 100644
--- a/pesign-test-app.spec
+++ b/pesign-test-app.spec
@@ -1,7 +1,7 @@
 Summary: Simple pesign test target
 Name: pesign-test-app
 Version: 5
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: GPLv2
 URL: https://github.com/vathpela/pesign-test-app
 BuildRequires: gcc
@@ -51,25 +51,25 @@ getfacl /run/pesign/socket || :
 cp %{name}-unsigned.efi %{name}-unsigned.0.efi
 %pesign -s -i %{name}-unsigned.0.efi -o %{name}-signed.0.efi
 %define pe_signing_cert fwupd-signer
-cp %{name}-unsigned.efi %{name}-unsigned.1.efi
-%pesign -s -i %{name}-unsigned.1.efi -o %{name}-signed.1.efi -n "fwupd-signer"
+%pesign -s -i %{name}-signed.0.efi -o %{name}-signed.efi -n "fwupd-signer"
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/%{_libdir}
 make LIBDIR=%{_libdir} INSTALLROOT=%{buildroot} DATADIR=%{_datadir} \
 	install
-mv %{name}-signed*.efi %{buildroot}/%{_datadir}/%{name}-%{version}/
+mv %{name}-signed.efi %{buildroot}/%{_datadir}/%{name}-%{version}/
 
 %check
 ls -la /var/run/pesign || :
-%ifarch %{x86}
+%ifarch %{efi}
 # for display in the build log
 for x in %{buildroot}/%{_datadir}/%{name}-%{version}/%{name}-signed.* ; do
 	pesign -l -i "${x}"
 	# to test the actual output
 	pesign -l -i "${x}" | grep -c -q "^Signing time: $(date +%%a\ %%b\ %%d,\ %%Y)$"
-	pesign -l -i "${x}" | grep -c -q '^The signer.s common name is Fedora Secure Boot Signer$'
+	pesign -l -i "${x}" | grep -c -q '^The signer.s common name is Fedora Secure Boot Signer$' ||
+	pesign -l -i "${x}" | grep -c -q '^The signer.s common name is fwupd-signer$'
 %endif
 
 %files
@@ -79,6 +79,9 @@ for x in %{buildroot}/%{_datadir}/%{name}-%{version}/%{name}-signed.* ; do
 %{_datadir}/%{name}-%{version}/%{name}-signed*.efi
 
 %changelog
+* Mon Jul 13 2020 Peter Jones <pjones@redhat.com> - 5-23
+- Test builders again again
+
 * Mon Jul 13 2020 Peter Jones <pjones@redhat.com> - 5-22
 - Test builders again again