From 2097bc89122495ca90e987a491a2f8922d29bdc8 Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
Date: Thu, 21 Aug 2025 03:13:02 -0400
Subject: [PATCH] * Thu Aug 21 2025 Miroslav Rezanina <mrezanin@redhat.com> -
 10.0.0-12

- kvm-RHEL-Pack-uefi-vars-module.patch [RHEL-102325]
- Resolves: RHEL-102325
  ([qemu] enable variable service for edk2)
---
 qemu-kvm.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/qemu-kvm.spec b/qemu-kvm.spec
index 0cebb78..e6d2c9d 100644
--- a/qemu-kvm.spec
+++ b/qemu-kvm.spec
@@ -143,7 +143,7 @@ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version}                    \
 Summary: QEMU is a machine emulator and virtualizer
 Name: qemu-kvm
 Version: 10.0.0
-Release: 11%{?rcrel}%{?dist}%{?cc_suffix}
+Release: 12%{?rcrel}%{?dist}%{?cc_suffix}
 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
 # Epoch 15 used for RHEL 8
 # Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5)
@@ -1231,6 +1231,8 @@ rm -rf %{buildroot}%{_mandir}/man1/virtfs-proxy-helper*
 %ifarch s390x
     # Use the s390-ccw.img that we've just built, not the pre-built one
     install -m 0644 %{qemu_kvm_build}/pc-bios/s390-ccw/s390-ccw.img %{buildroot}%{_datadir}/%{name}/
+    # Remove uefi vars
+    rm -rf %{buildroot}%{_libdir}/%{name}/hw-uefi-vars.so
 %else
     rm -rf %{buildroot}%{_libdir}/%{name}/hw-s390x-virtio-gpu-ccw.so
 %endif
@@ -1267,9 +1269,6 @@ rm -rf %{buildroot}%{_datadir}/%{name}/bios*.bin
 rm -rf %{buildroot}%{_datadir}/%{name}/vof-nvram.bin
 rm -rf %{buildroot}%{_datadir}/%{name}/vof.bin
 
-# Remove uefi vars
-rm -rf %{buildroot}%{_libdir}/%{name}/hw-uefi-vars.so
-
 %if %{have_modules_load}
     install -D -p -m 644 %{_sourcedir}/modules-load.conf %{buildroot}%{_sysconfdir}/modules-load.d/kvm.conf
 %endif
@@ -1423,6 +1422,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %endif
 %ifarch s390x
     %{_datadir}/%{name}/s390-ccw.img
+%else
+    %{_libdir}/%{name}/hw-uefi-vars.so
 %endif
 %{_datadir}/icons/*
 %{_datadir}/%{name}/linuxboot_dma.bin
@@ -1502,6 +1503,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %endif
 
 %changelog
+* Thu Aug 21 2025 Miroslav Rezanina <mrezanin@redhat.com> - 10.0.0-12
+- kvm-RHEL-Pack-uefi-vars-module.patch [RHEL-102325]
+- Resolves: RHEL-102325
+  ([qemu] enable variable service for edk2)
+
 * Mon Aug 18 2025 Miroslav Rezanina <mrezanin@redhat.com> - 10.0.0-11
 - kvm-rbd-Fix-.bdrv_get_specific_info-implementation.patch [RHEL-105440]
 - Resolves: RHEL-105440