From a42ecc25bc5f19e8374deae3336a7e7cbf2d3713 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@datto.com>
Date: Mar 11 2021 15:59:13 +0000
Subject: Modify architecture conditionals to add architecture names for Debian/Ubuntu


The architecture names aren't *exactly* the same between RPM and dpkg,
so we need to handle that properly here.

---

diff --git a/libvirt.spec b/libvirt.spec
index 7e39add..a90a780 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -5,22 +5,22 @@
     %define _vpath_builddir %{_target_platform}
 %endif
 
-%define arches_qemu_kvm         %{ix86} x86_64 %{power64} %{arm} aarch64 s390x
+%define arches_qemu_kvm         %{ix86} x86_64 amd64 %{power64} %{arm} aarch64 arm64 s390x
 %if 0%{?rhel}
     %define arches_qemu_kvm     x86_64 %{power64} aarch64 s390x
 %endif
 
-%define arches_64bit            x86_64 %{power64} aarch64 s390x riscv64
-%define arches_x86              %{ix86} x86_64
+%define arches_64bit            x86_64 amd64 %{power64} aarch64 arm64 s390x riscv64
+%define arches_x86              %{ix86} x86_64 amd64
 
 %define arches_systemtap_64bit  %{arches_64bit}
 %define arches_dmidecode        %{arches_x86}
-%define arches_xen              %{arches_x86} aarch64
+%define arches_xen              %{arches_x86} aarch64 arm64
 %define arches_vbox             %{arches_x86}
 %define arches_ceph             %{arches_64bit}
 %define arches_zfs              %{arches_x86} %{power64} %{arm}
-%define arches_numactl          %{arches_x86} %{power64} aarch64
-%define arches_numad            %{arches_x86} %{power64} aarch64
+%define arches_numactl          %{arches_x86} %{power64} aarch64 arm64
+%define arches_numad            %{arches_x86} %{power64} aarch64 arm64
 
 # The hypervisor drivers that run in libvirtd
 %define with_qemu          0%{!?_without_qemu:1}