diff --git a/SOURCES/1000-Add-AlmaLinux-detection.patch b/SOURCES/1000-Add-AlmaLinux-detection.patch new file mode 100644 index 0000000..9c794da --- /dev/null +++ b/SOURCES/1000-Add-AlmaLinux-detection.patch @@ -0,0 +1,25 @@ +From 3b01a0e630c2e0ccc08b78544dcfd35e6a948b07 Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Fri, 8 Apr 2022 16:09:38 +0000 +Subject: [PATCH] Add AlmaLinux detection + +--- + m4/guestfs-appliance.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4 +index b0a6ab4..66eef8a 100644 +--- a/m4/guestfs-appliance.m4 ++++ b/m4/guestfs-appliance.m4 +@@ -105,7 +105,7 @@ AC_ARG_WITH([distro], + ( . /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' ) >&AS_MESSAGE_LOG_FD + DISTRO="`. /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'`" + AS_CASE([$DISTRO], +- [FEDORA | RHEL | CENTOS],[DISTRO=REDHAT], ++ [FEDORA | RHEL | CENTOS | ALMALINUX],[DISTRO=REDHAT], + [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], + [ARCH],[DISTRO=ARCHLINUX], + [OPENMANDRIVA],[DISTRO=OPENMANDRIVA]) +-- +2.27.0 + diff --git a/SPECS/libguestfs.spec b/SPECS/libguestfs.spec index 6cf69fb..2012d35 100644 --- a/SPECS/libguestfs.spec +++ b/SPECS/libguestfs.spec @@ -32,7 +32,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.44.0 -Release: 5%{?dist} +Release: 5%{?dist}.alma License: LGPLv2+ ExclusiveArch: x86_64 %{power64} aarch64 s390x @@ -70,6 +70,9 @@ Patch0017: 0017-launch-libvirt-place-our-virtio-net-pci-device-in-sl.patch Patch0018: 0018-lib-extract-NETWORK_ADDRESS-and-NETWORK_PREFIX-as-ma.patch Patch0019: 0019-launch-libvirt-add-virtio-net-via-the-standard-inter.patch +# AlmaLinux detection patch +Patch1000: 1000-Add-AlmaLinux-detection.patch + # Replacement README file. Source4: README-replacement.in @@ -1182,6 +1185,9 @@ rm ocaml/html/.gitignore %changelog +* Fri Apr 08 2022 Andrew Lukoshko - 1:1.44.0-5.alma +- Fix build for AlmaLinux + * Fri Dec 24 2021 Richard W.M. Jones - 1:1.44.0-5 - Fix libguestfs failure with qemu 6.2, libvirt 7.10 resolves: rhbz#2035177