From 18240b2c2ddde15a2b27f21f5fba748a1bcd6b8a Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Jun 06 2022 23:23:11 +0000
Subject: user-static binfmt files aren't packaged on native archs


Signed-off-by: Cole Robinson <crobinso@redhat.com>

---

diff --git a/qemu.spec b/qemu.spec
index d79e270..7d5771e 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -2374,7 +2374,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %{_bindir}/qemu-aarch64_be-static
 %{_datadir}/systemtap/tapset/qemu-aarch64.stp
 %{_datadir}/systemtap/tapset/qemu-aarch64_be-static.stp
+%ifnarch aarch64
 %{_exec_prefix}/lib/binfmt.d/qemu-aarch64-static.conf
+%endif
 %{_exec_prefix}/lib/binfmt.d/qemu-aarch64_be-static.conf
 
 %files user-static-alpha
@@ -2386,7 +2388,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %{_bindir}/qemu-arm-static
 %{_bindir}/qemu-armeb-static
 %{_datadir}/systemtap/tapset/qemu-armeb-static.stp
+%ifnarch aarch64
 %{_exec_prefix}/lib/binfmt.d/qemu-arm-static.conf
+%endif
 %{_exec_prefix}/lib/binfmt.d/qemu-armeb-static.conf
 
 %files user-static-cris
@@ -2454,7 +2458,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %{_datadir}/systemtap/tapset/qemu-ppc64le-static.stp
 %{_exec_prefix}/lib/binfmt.d/qemu-ppc-static.conf
 %{_exec_prefix}/lib/binfmt.d/qemu-ppc64-static.conf
+%ifnarch ppc64le
 %{_exec_prefix}/lib/binfmt.d/qemu-ppc64le-static.conf
+%endif
 
 %files user-static-riscv
 %{_bindir}/qemu-riscv32-static
@@ -2462,12 +2468,16 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %{_datadir}/systemtap/tapset/qemu-riscv32-static.stp
 %{_datadir}/systemtap/tapset/qemu-riscv64-static.stp
 %{_exec_prefix}/lib/binfmt.d/qemu-riscv32-static.conf
+%ifnarch riscv64
 %{_exec_prefix}/lib/binfmt.d/qemu-riscv64-static.conf
+%endif
 
 %files user-static-s390x
 %{_bindir}/qemu-s390x-static
 %{_datadir}/systemtap/tapset/qemu-s390x-static.stp
+%ifnarch s390x
 %{_exec_prefix}/lib/binfmt.d/qemu-s390x-static.conf
+%endif
 
 %files user-static-sh4
 %{_bindir}/qemu-sh4-static
@@ -2493,6 +2503,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %{_bindir}/qemu-x86_64-static
 %{_datadir}/systemtap/tapset/qemu-i386-static.stp
 %{_datadir}/systemtap/tapset/qemu-x86_64-static.stp
+%ifnarch %{ix86} x86_64
+%{_exec_prefix}/lib/binfmt.d/qemu-i386-static.conf
+%{_exec_prefix}/lib/binfmt.d/qemu-i486-static.conf
+%{_exec_prefix}/lib/binfmt.d/qemu-x86_64-static.conf
+%endif
 
 %files user-static-xtensa
 %{_bindir}/qemu-xtensa-static