AlmaLinux changes

SOURCES/0096-Add-AlmaLinux-detection.patch

@@ -0,0 +1,25 @@
+From f6b64a276669cd1e9ff0e98db5009083a35f2ef1 Mon Sep 17 00:00:00 2001
+From: Andrew Lukoshko <andrew.lukoshko@gmail.com>
+Date: Mon, 6 Sep 2021 13:59:24 +0000
+Subject: [PATCH] Add AlmaLinux detection
+
+---
+ m4/guestfs-appliance.m4 | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4
+index 5a7af51..9481376 100644
+--- a/m4/guestfs-appliance.m4
++++ b/m4/guestfs-appliance.m4
+@@ -104,7 +104,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])
+             AC_MSG_RESULT([$DISTRO (from /etc/os-release)])
+-- 
+2.27.0
+

SPECS/libguestfs.spec

@@ -1,3 +1,4 @@
+%global dist %{?dist}.alma
 %global _hardened_build 1
 
 # Architectures that we run the basic sanity-check test.
@@ -151,6 +152,9 @@ Patch0094:     0094-mlcustomize-Refactor-SELinux_relabel-code.patch
 Patch0095:     0095-mlcustomize-Fall-back-to-autorelabel-if-specfile-doe.patch
 Patch0096:     0096-daemon-lvm-Use-lvcreate-yes-to-avoid-interactive-pro.patch
 
+# AlmaLinux support patch
+Patch1000:     0096-Add-AlmaLinux-detection.patch
+
 # Use git for patch management.
 BuildRequires: git
 
@@ -844,7 +848,10 @@ sed 's/@VERSION@/%{version}/g' < %{SOURCE4} > README
 ip addr list ||:
 ip route list ||:
 if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
-  extra=
+  # AlmaLinux: avoid permission denied for yum/dnf cache
+  mkdir cachedir
+  sed -e "s|/var/cache/yum|$(pwd)/cachedir|" -e "s|/var/cache/dnf|$(pwd)/cachedir|" /etc/dnf/dnf.conf > yum.conf
+  extra=--with-supermin-packager-config=$(pwd)/yum.conf
 else
   mkdir cachedir repo
   # -n 1 because of RHBZ#980502.
@@ -1280,6 +1287,10 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
 
 
 %changelog
+* Sat Oct 09 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 1:1.40.2-28.alma
+- Fix build for AlmaLinux
+- Avoid permission denied for yum/dnf cache
+
 * Tue Apr 20 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.40.2-28
 - daemon: lvm: Use lvcreate --yes to avoid interactive prompts
   resolves: rhbz#1933640