From 49700015edd952aa22b5c6fbc7e816c484cbf0c1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 9 Feb 2021 10:22:55 +0000
Subject: [PATCH] Remove gfs2-utils dependency in RHEL 9.

---
 libguestfs.spec | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/libguestfs.spec b/libguestfs.spec
index fa01289..9fc8f60 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -56,7 +56,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.44.0
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       LGPLv2+
 
 # Build only for architectures that have a kernel
@@ -226,7 +226,9 @@ BuildRequires: findutils
 BuildRequires: gawk
 BuildRequires: gdisk
 BuildRequires: genisoimage
+%if !0%{?rhel}
 BuildRequires: gfs2-utils
+%endif
 BuildRequires: grep
 BuildRequires: gzip
 %if !0%{?rhel}
@@ -389,9 +391,7 @@ For enhanced features, install:
 
 %if !0%{?rhel}
      libguestfs-forensics  adds filesystem forensics support
-%endif
           libguestfs-gfs2  adds Global Filesystem (GFS2) support
-%if !0%{?rhel}
        libguestfs-hfsplus  adds HFS+ (Mac filesystem) support
 %endif
  libguestfs-inspect-icons  adds support for inspecting guest icons
@@ -460,6 +460,7 @@ want to forensically analyze disk images using The Sleuth Kit.
 %endif
 
 
+%if !0%{?rhel}
 %package gfs2
 Summary:       GFS2 support for %{name}
 License:       LGPLv2+
@@ -468,6 +469,7 @@ Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 %description gfs2
 This adds GFS2 support to %{name}.  Install it if you want to process
 disk images containing GFS2.
+%endif
 
 
 %if !0%{?rhel}
@@ -1043,9 +1045,7 @@ move_to qemu-img        zz-packages-dib
 move_to which           zz-packages-dib
 %if !0%{?rhel}
 move_to sleuthkit       zz-packages-forensics
-%endif
 move_to gfs2-utils      zz-packages-gfs2
-%if !0%{?rhel}
 move_to hfsplus-tools   zz-packages-hfsplus
 move_to jfsutils        zz-packages-jfs
 move_to nilfs-utils     zz-packages-nilfs
@@ -1133,8 +1133,10 @@ rm ocaml/html/.gitignore
 %{_libdir}/guestfs/supermin.d/zz-packages-forensics
 %endif
 
+%if !0%{?rhel}
 %files gfs2
 %{_libdir}/guestfs/supermin.d/zz-packages-gfs2
+%endif
 
 %if !0%{?rhel}
 %ifnarch ppc
@@ -1375,6 +1377,9 @@ rm ocaml/html/.gitignore
 
 
 %changelog
+* Tue Feb 09 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.44.0-5
+- Remove gfs2-utils dependency in RHEL 9.
+
 * Thu Jan 28 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.44.0-4
 - ELN has full-fat qemu (not qemu-kvm).