From 867b41f7d30ed05869a5b74357feae9bb0015852 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Mon, 15 Aug 2022 20:21:32 +0000
Subject: [PATCH] Use --with-rpm-version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves: #2118390
Suggested-by: François Rigault <frigo@amadeus.com>
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
 grub.macros | 1 +
 grub2.spec  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/grub.macros b/grub.macros
index d967035e..2b2ce2d4 100644
--- a/grub.macros
+++ b/grub.macros
@@ -347,6 +347,7 @@ rm -r build-aux m4						\
 	TARGET_CFLAGS="%{2}"					\\\
 	TARGET_CPPFLAGS="-I$(pwd)"				\\\
 	TARGET_LDFLAGS="%{efi_target_ldflags}"			\\\
+	--with-rpm-version=%{version}-%{release}		\\\
 	--with-platform=efi					\\\
 	--with-utils=host					\\\
 	--target=%{1}						\\\
diff --git a/grub2.spec b/grub2.spec
index 1d6a5fdf..a9a9231f 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -530,6 +530,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Mon Aug 15 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-48
+- Use --with-rpm-version
+- Resolves: #2118390
+
 * Mon Aug 08 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-47
 - Try reserving less RAM to fix windows booting
 - Related: #2115202