From 044b45c662db4fdc582e76a5b61947131a58270d Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Fri, 29 Nov 2024 09:43:22 +0300
Subject: [PATCH] import libguestfs-1.54.0-5.el10

---
 SPECS/libguestfs.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/SPECS/libguestfs.spec b/SPECS/libguestfs.spec
index 05cbd25..e95a385 100644
--- a/SPECS/libguestfs.spec
+++ b/SPECS/libguestfs.spec
@@ -42,7 +42,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.54.0
-Release:       3%{?dist}
+Release:       5%{?dist}
 License:       LGPL-2.1-or-later
 
 # Build only for architectures that have a kernel
@@ -269,8 +269,8 @@ BuildRequires: scrub
 BuildRequires: sed
 %if !0%{?rhel}
 BuildRequires: sleuthkit
-%endif
 BuildRequires: squashfs-tools
+%endif
 BuildRequires: strace
 %if !0%{?rhel}
 %ifarch %{ix86} x86_64
@@ -823,6 +823,10 @@ find $RPM_BUILD_ROOT -name .packlist -delete
 find $RPM_BUILD_ROOT -name '*.bs' -delete
 find $RPM_BUILD_ROOT -name 'bindtests.pl' -delete
 
+# debuginfo generation fails with debugedit >= 5.1 unless the files
+# are writable:
+find $RPM_BUILD_ROOT -name Guestfs.so -exec chmod u+w {} \;
+
 # golang: Ignore what libguestfs upstream installs, and just copy the
 # source files to %%{_datadir}/gocode/src.
 %ifarch %{golang_arches}
@@ -1121,13 +1125,17 @@ rm ocaml/html/.gitignore
 
 
 %changelog
-* Wed Oct 30 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.54.0-3
+* Tue Nov 26 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.54.0-5
 - Rebase to libguestfs 1.54.0
   resolves: RHEL-56810
 - Fix osinfo for Windows Server 2025
   resolves: RHEL-62989
 - Replace Jansson with json-c
   resolves: RHEL-65293
+- Remove squashfs-tools on RHEL
+  resolves: RHEL-68937
+- Fix perl-Sys-Guestfs debuginfo
+  resolves: RHEL-68973
 
 * Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:1.52.2-4
 - Rebuilt for MSVSphere 10