Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libguestfs.git#2f9953e2d14702ec51cd6bdfe077a9c264dedce2

libguestfs.spec

@@ -24,7 +24,13 @@
 # s390x:   qemu TCG cannot emulate enough to boot the kernel
 #            (however KVM would work if it was available in Koji, so this
 #            is not a bug)
+%if !0%{?rhel}
 %global test_arches x86_64
+%else
+# RHEL 9 only:
+# x86-64:  "/lib64/libc.so.6: CPU ISA level is lower than required"
+%global test_arches NONE
+%endif
 
 # Trim older changelog entries.
 # https://lists.fedoraproject.org/pipermail/devel/2013-April/thread.html#181627
@@ -49,7 +55,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.44.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       LGPLv2+
 
 # Build only for architectures that have a kernel
@@ -921,7 +927,7 @@ else
 fi
 
 %{configure} \
-%if 0%{?rhel}
+%if 0%{?rhel} && !0%{?eln}
   QEMU=%{_libexecdir}/qemu-kvm \
 %endif
   PYTHON=%{__python3} \
@@ -931,7 +937,7 @@ fi
 %else
   --with-extra="rhel=%{rhel},release=%{release},libvirt" \
 %endif
-%if 0%{?rhel}
+%if 0%{?rhel} && !0%{?eln}
   --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \
   --disable-php \
 %endif
@@ -1365,6 +1371,9 @@ rm ocaml/html/.gitignore
 
 
 %changelog
+* Thu Jan 28 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.44.0-4
+- ELN has full-fat qemu (not qemu-kvm).
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.44.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild