diff --git a/1000-Add-Oracle-Linux-identifier.patch b/1000-Add-Oracle-Linux-identifier.patch deleted file mode 100644 index 2780691..0000000 --- a/1000-Add-Oracle-Linux-identifier.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 39e25217dccb4b49f2ab481f0b026f1498973647 Mon Sep 17 00:00:00 2001 -From: Darren Archibald -Date: Mon, 3 Oct 2022 09:55:14 -0700 -Subject: [PATCH] Add Oracle Linux identifier - -Signed-off-by: Darren Archibald ---- - daemon/inspect_fs_unix.ml | 1 + - m4/guestfs-appliance.m4 | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml -index d8dce60..ee89ff0 100644 ---- a/daemon/inspect_fs_unix.ml -+++ b/daemon/inspect_fs_unix.ml -@@ -159,6 +159,7 @@ and distro_of_os_release_id = function - | "pardus" -> Some DISTRO_PARDUS - | "pld" -> Some DISTRO_PLD_LINUX - | "rhel" -> Some DISTRO_RHEL -+ | "ol" -> Some DISTRO_ORACLE_LINUX - | "rocky" -> Some DISTRO_ROCKY - | "sles" | "sled" -> Some DISTRO_SLES - | "ubuntu" -> Some DISTRO_UBUNTU -diff --git a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4 -index 4e671d2..dc06d1a 100644 ---- a/m4/guestfs-appliance.m4 -+++ b/m4/guestfs-appliance.m4 -@@ -114,7 +114,7 @@ if test "x$ENABLE_APPLIANCE" = "xyes"; then - fi ) | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' - )" - AS_CASE([$DISTRO], -- [FEDORA | RHEL | CENTOS | ALMALINUX | CLOUDLINUX \ -+ [FEDORA | RHEL | OL | CENTOS | ALMALINUX | CLOUDLINUX \ - | ROCKY | VIRTUOZZO], - [DISTRO=REDHAT], - [OPENSUSE* | SLED | SLES],[DISTRO=SUSE], --- -2.39.3 - diff --git a/libguestfs.spec b/libguestfs.spec index e14c52c..c7dbea2 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.56.1 -Release: 4.0.1%{?dist} +Release: 4%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -101,8 +101,6 @@ Patch0018: 0018-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch Patch0019: 0019-RHEL-appliance-init-Run-depmod-a-to-rebuild-kernel-m.patch Patch0020: 0020-daemon-device-name-translation.c-Fix-btrfs-volume-re.patch -Patch1000: 1000-Add-Oracle-Linux-identifier.patch - BuildRequires: autoconf, automake, libtool, gettext-devel # Basic build requirements. @@ -211,7 +209,9 @@ BuildRequires: attr BuildRequires: augeas-libs BuildRequires: bash BuildRequires: binutils +%if !0%{?rhel} BuildRequires: btrfs-progs +%endif BuildRequires: bzip2 BuildRequires: clevis-luks BuildRequires: coreutils @@ -527,7 +527,7 @@ guests. Install this package if you want libguestfs to be able to inspect non-Linux guests and display icons from them. The only reason this is a separate package is to avoid core libguestfs -having to depend on Perl. +having to depend on Perl. See https://bugzilla.redhat.com/1194158 %package bash-completion @@ -755,7 +755,6 @@ fi --disable-php \ --disable-ruby \ %endif - --with-extra-packages="btrfs-progs" \ $extra # 'INSTALLDIRS' ensures that Perl and Ruby libs are installed in the @@ -1087,12 +1086,6 @@ rm ocaml/html/.gitignore %changelog -* Tue Apr 07 2026 EL Errata - 1.56.1-4.0.1 -- Add btrfs-progs to the packages installed in the appliance [Orabug: 34137448] -- Replace upstream references from a description tag -- Fix build on Oracle Linux [Orabug: 29319324] -- Set DISTRO_ORACLE_LINUX correspeonding to ol - * Mon Mar 09 2026 Richard W.M. Jones - 1:1.56.1-4 - Fix btrfs volume reverse translation resolves: RHEL-149119