Correct handling of rhel and centos macros

Resolves: #2044886
Signed-off-by: Robbie Harwood <rharwood@redhat.com>

0004-macros.pesign-handle-centos-like-rhel-with-rhelver.patch

@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 10 Aug 2021 12:39:08 -0400
+Subject: [PATCH] macros.pesign: handle centos like rhel with --rhelver
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+(cherry picked from commit a1bc65c8b0fc20dbe9c9714ee3a31937184ba7f6)
+(cherry picked from commit 83190f50505a0744dfb70d3b549914ae713e6713)
+---
+ src/macros.pesign | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/macros.pesign b/src/macros.pesign
+index 34af57c..b7d6af1 100644
+--- a/src/macros.pesign
++++ b/src/macros.pesign
+@@ -34,7 +34,8 @@
+     %{?__pesign_cert:--cert %{__pesign_cert}}				\\\
+     %{?_buildhost:--hostname "%{_buildhost}"}				\\\
+     %{?vendor:--vendor "%{vendor}"}					\\\
+-    %{?_rhel:--rhelver "%{_rhel}"}					\\\
++    %{?rhel:--rhelver "%{rhel}"}					\\\
++    %{?centos:--rhelver "%{centos}"}					\\\
+     %{?-n:--rhelcert %{-n*}}%{?!-n:--rhelcert %{__pesign_cert}}	\\\
+     %{?-a:--rhelcafile "%{-a*}"}					\\\
+     %{?-c:--rhelcertfile "%{-c*}"}					\\\

pesign.patches

@@ -1,3 +1,4 @@
 Patch0001: 0001-daemon-remove-always-true-comparison.patch
 Patch0002: 0002-Disable-pragmas-for-warnings-that-are-too-old.patch
 Patch0003: 0003-Add-D_GLIBCXX_ASSERTIONS-to-CPPFLAGS.patch
+Patch0004: 0004-macros.pesign-handle-centos-like-rhel-with-rhelver.patch

pesign.spec

@@ -3,7 +3,7 @@
 Name:    pesign
 Summary: Signing utility for UEFI binaries
 Version: 115
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL-2.0-only
 URL:     https://github.com/rhboot/pesign
 
@@ -162,6 +162,10 @@ certutil -d %{_sysconfdir}/pki/pesign/ -X -L > /dev/null
 %{python3_sitelib}/mockbuild/plugins/pesign.*
 
 %changelog
+* Fri Apr 01 2022 Robbie Harwood <rharwood@redhat.com> - 115-3
+- Correct handling of rhel and centos macros
+- Resolves: #2044886
+
 * Fri Mar 25 2022 Robbie Harwood <rharwood@redhat.com> - 115-2
 - Add -D_GLIBCXX_ASSERTIONS
 - Resolves: #2044886