From 6c4260e0831908b37896c107a9c2b820637a9043 Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 6 May 2025 13:19:31 +0200
Subject: [PATCH] libvirt-11.3.0-1.el10

- Rebased to libvirt-11.3.0 (RHEL-71662)
- The rebase also fixes the following bugs:
    RHEL-27172, RHEL-79088, RHEL-82411, RHEL-84257, RHEL-85320
    RHEL-85414, RHEL-85672, RHEL-86523, RHEL-86776, RHEL-86778

Resolves: RHEL-27172, RHEL-71662, RHEL-79088, RHEL-82411, RHEL-84257
Resolves: RHEL-85320, RHEL-85414, RHEL-85672, RHEL-86523, RHEL-86776
Resolves: RHEL-86778
---
 ..._map-Install-Ampere-1-ARM-CPU-models.patch | 33 -------------------
 libvirt.spec                                  | 17 ++++++----
 sources                                       |  2 +-
 3 files changed, 11 insertions(+), 41 deletions(-)
 delete mode 100644 libvirt-cpu_map-Install-Ampere-1-ARM-CPU-models.patch

diff --git a/libvirt-cpu_map-Install-Ampere-1-ARM-CPU-models.patch b/libvirt-cpu_map-Install-Ampere-1-ARM-CPU-models.patch
deleted file mode 100644
index f471c55..0000000
--- a/libvirt-cpu_map-Install-Ampere-1-ARM-CPU-models.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 96c02c6007df80addfa48e9a94308c59dabb75a8 Mon Sep 17 00:00:00 2001
-Message-ID: <96c02c6007df80addfa48e9a94308c59dabb75a8.1744037234.git.jdenemar@redhat.com>
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 4 Apr 2025 14:22:01 +0200
-Subject: [PATCH] cpu_map: Install Ampere-1 ARM CPU models
-
-Fixes: 282f38ad3d3960b24aa97d75cae95c8c3d08a218
-Fixes: https://gitlab.com/libvirt/libvirt/-/issues/762
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 701b2c0fcac8b911c4d8b916ee07eddc098e8772)
-
-https://issues.redhat.com/browse/RHEL-71662
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/cpu_map/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
-index 9a1c048620..dee8441a13 100644
---- a/src/cpu_map/meson.build
-+++ b/src/cpu_map/meson.build
-@@ -1,5 +1,7 @@
- cpumap_data = [
-   'arm_a64fx.xml',
-+  'arm_Ampere-1a.xml',
-+  'arm_Ampere-1.xml',
-   'arm_cortex-a53.xml',
-   'arm_cortex-a57.xml',
-   'arm_cortex-a72.xml',
--- 
-2.49.0
diff --git a/libvirt.spec b/libvirt.spec
index 8aa4981..ae905d8 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -8,7 +8,9 @@
 
 %define arches_qemu_kvm         %{ix86} x86_64 %{power64} %{arm} aarch64 s390x riscv64
 %if 0%{?rhel}
-    %if 0%{?rhel} > 8
+    %if 0%{?rhel} >= 10
+        %define arches_qemu_kvm     x86_64 aarch64 s390x riscv64
+    %elif 0%{?rhel} >= 9
         %define arches_qemu_kvm     x86_64 aarch64 s390x
     %else
         %define arches_qemu_kvm     x86_64 %{power64} aarch64 s390x
@@ -300,7 +302,7 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 11.2.0
+Version: 11.3.0
 Release: 1%{?dist}%{?extra_release}
 License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1
 URL: https://libvirt.org/
@@ -309,8 +311,6 @@ URL: https://libvirt.org/
     %define mainturl stable_updates/
 %endif
 Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz
-Patch1: libvirt-cpu_map-Install-Ampere-1-ARM-CPU-models.patch
-
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -1182,9 +1182,6 @@ MinGW Windows libvirt virtualization library.
 %prep
 %autosetup -S git_am -N
 
-%autopatch
-
-
 %build
 %if 0%{?fedora} >= %{min_fedora} || 0%{?rhel} >= %{min_rhel}
     %define supported_platform 1
@@ -2714,6 +2711,12 @@ exit 0
 %endif
 
 %changelog
+* Tue May  6 2025 Jiri Denemark <jdenemar@redhat.com> - 11.3.0-1
+- Rebased to libvirt-11.3.0 (RHEL-71662)
+- The rebase also fixes the following bugs:
+    RHEL-27172, RHEL-79088, RHEL-82411, RHEL-84257, RHEL-85320
+    RHEL-85414, RHEL-85672, RHEL-86523, RHEL-86776, RHEL-86778
+
 * Mon Apr  7 2025 Jiri Denemark <jdenemar@redhat.com> - 11.2.0-1
 - Rebased to libvirt-11.2.0 (RHEL-71662)
 - The rebase also fixes the following bugs:
diff --git a/sources b/sources
index feecf08..b806f58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libvirt-11.2.0.tar.xz) = 78fdc0e7cc09687eb9fdb3d43ceab63018fb06d931669e4a461ddb2612a2367d885f59de14b7770ff164e5a30e487a0dc8c8bdcc778a14c4cf37e0e7db162792
+SHA512 (libvirt-11.3.0.tar.xz) = 9d498c5b13d1754feebf3094bea773d1e07098d0badf6b6d816d7ba11a6eda5496a172aba789d3ae28578320559b5b3c9470411139c3dd58b0b763b85ec1c0a4