Fix sbat and spec file

SOURCES/sbat.csv.in

@@ -1,4 +1,4 @@
 sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
 grub,2,Free Software Foundation,grub,@@VERSION@@,https//www.gnu.org/software/grub/
-grub.rh,2,Red Hat,grub2,@@VERSION_RELEASE@@,mailto:secalert@redhat.com
-grub.almalinux8,2,AlmaLinux 8,grub2,@@VERSION_RELEASE@@,mail:security@almalinux.org
+grub.rh,2,Red Hat,grub2,@@RHEL_VERSION_RELEASE@@,mailto:secalert@redhat.com
+grub.almalinux,2,AlmaLinux,grub2,@@VERSION_RELEASE@@,mail:security@almalinux.org

SPECS/grub2.spec

@@ -45,7 +45,7 @@ Source19:	sbat.csv.in
 %endif
 
 # AlmaLinux: keep upstream EVR for RHEL SBAT entry
-%define rhel_evr $(echo %{evr} | sed 's/\.alma.*//')
+%define rhel_version_release $(echo %{version}-%{release} | sed 's/\.alma.*//')
 
 # generate with do-rebase
 %include %{SOURCE2}
@@ -164,8 +164,8 @@ This subpackage provides tools for support of all platforms.
 mkdir grub-%{grubefiarch}-%{tarversion}
 grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grubefiarch}-%{tarversion}/.gitignore
 cp %{SOURCE4} grub-%{grubefiarch}-%{tarversion}/unifont.pcf.gz
-sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" \
-    %{SOURCE19} > grub-%{grubefiarch}-%{tarversion}/sbat.csv
+sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" -e "s,@@RHEL_VERSION_RELEASE@@,%{rhel_version_release},g" \
+     %{SOURCE19} > grub-%{grubefiarch}-%{tarversion}/sbat.csv
 git add grub-%{grubefiarch}-%{tarversion}
 %endif
 %if 0%{with_alt_efi_arch}
@@ -508,12 +508,9 @@ fi
 %endif
 
 %changelog
-<<<<<<< HEAD
-* Tue Apr 05 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 2.06-120.alma
+* Fri Oct 07 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 2.06-138.alma
 - Use AlmaLinux cert and SBAT
 
-* Fri Feb 28 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-120
-=======
 * Wed Jul 20 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-138
 - Rotate signing keys on ppc64le
 - Resolves: #2074762
@@ -552,7 +549,6 @@ fi
 - Backport support for loading initrd above 4GB
 
 * Mon Feb 28 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-120
->>>>>>> c8-beta
 - Bump signing
 - Resolves: #2032294