F32 doesn't have %{kernel_arches}

Revert part of previous merge.

copy-patches.sh

@@ -0,0 +1,56 @@
+#!/bin/bash -
+
+set -e
+
+# Maintainer script to copy patches from the git repo to the current
+# directory.  It's normally only used downstream (ie. in RHEL).  Use
+# it like this:
+#   ./copy-patches.sh
+
+rhel_version=9.0.0
+
+# Check we're in the right directory.
+if [ ! -f libguestfs.spec ]; then
+    echo "$0: run this from the directory containing 'libguestfs.spec'"
+    exit 1
+fi
+
+git_checkout=$HOME/d/libguestfs-rhel-$rhel_version
+if [ ! -d $git_checkout ]; then
+    echo "$0: $git_checkout does not exist"
+    echo "This script is only for use by the maintainer when preparing a"
+    echo "libguestfs release on RHEL."
+    exit 1
+fi
+
+# Get the base version of libguestfs.
+version=`grep '^Version:' libguestfs.spec | awk '{print $2}'`
+tag="v$version"
+
+# Remove any existing patches.
+git rm -f [0-9]*.patch ||:
+rm -f [0-9]*.patch
+
+# Get the patches.
+(cd $git_checkout; rm -f [0-9]*.patch; git format-patch -N --submodule=diff $tag)
+mv $git_checkout/[0-9]*.patch .
+
+# Remove any not to be applied.
+rm -f *NOT-FOR-RPM*.patch
+
+# Add the patches.
+git add [0-9]*.patch
+
+# Print out the patch lines.
+echo
+echo "--- Copy the following text into libguestfs.spec file"
+echo
+
+echo "# Patches."
+for f in [0-9]*.patch; do
+    n=`echo $f | awk -F- '{print $1}'`
+    echo "Patch$n:     $f"
+done
+
+echo
+echo "--- End of text"

libguestfs.spec

@@ -33,7 +33,7 @@
 %global patches_touch_autotools 1
 
 # The source directory.
-%global source_directory 1.43-development
+%global source_directory 1.44-stable
 
 # Filter perl provides.
 %{?perl_default_filter}
@@ -44,12 +44,12 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.43.2
+Version:       1.44.0
 Release:       1%{?dist}
 License:       LGPLv2+
 
-# Build only for architectures that have a kernel
-ExclusiveArch: %{kernel_arches}
+# No kernel https://fedoraproject.org/wiki/Changes/Stop_Building_i686_Kernels
+ExcludeArch:   i686
 
 # Source and patches.
 URL:           http://libguestfs.org/
@@ -58,7 +58,7 @@ Source0:       http://libguestfs.org/download/%{source_directory}/%{name}-%{vers
 Source1:       http://libguestfs.org/download/%{source_directory}/%{name}-%{version}.tar.gz.sig
 %endif
 
-# Replacement README file for Fedora users.
+# Replacement README file.
 Source4:       README-replacement.in
 
 # Guestfish colour prompts.
@@ -72,16 +72,20 @@ Source6:       yum.conf.in
 Source7:       libguestfs.keyring
 %endif
 
+# Maintainer script which helps with handling patches.
+Source8:       copy-patches.sh
+
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool, gettext-devel
 %endif
 
 # Basic build requirements for the library and virt tools.
 BuildRequires: gcc, gcc-c++
+BuildRequires: make
 BuildRequires: rpcgen
 BuildRequires: libtirpc-devel
 BuildRequires: supermin-devel >= 5.1.18
-BuildRequires: hivex-devel >= 1.2.7-7
+BuildRequires: hivex-devel >= 1.3.10
 BuildRequires: ocaml-hivex-devel
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -91,7 +95,7 @@ BuildRequires: augeas-devel >= 1.7.0
 BuildRequires: readline-devel
 BuildRequires: genisoimage
 BuildRequires: libxml2-devel
-BuildRequires: createrepo
+BuildRequires: createrepo_c
 BuildRequires: glibc-static
 BuildRequires: libselinux-utils
 BuildRequires: libselinux-devel
@@ -106,16 +110,22 @@ BuildRequires: libdb-utils
 BuildRequires: cpio
 BuildRequires: libconfig-devel
 BuildRequires: xz-devel
+%if !0%{?rhel}
 BuildRequires: zip
 BuildRequires: unzip
+%endif
 BuildRequires: systemd-units
 BuildRequires: netpbm-progs
 BuildRequires: icoutils
-BuildRequires: libvirt-daemon-kvm
+BuildRequires: libvirt-daemon-kvm >= 5.3.0
+%if !0%{?rhel}
 BuildRequires: perl(Expect)
+%endif
 BuildRequires: libacl-devel
 BuildRequires: libcap-devel
+%if !0%{?rhel}
 BuildRequires: libldm-devel
+%endif
 BuildRequires: jansson-devel
 BuildRequires: systemd-devel
 BuildRequires: bash-completion
@@ -126,6 +136,7 @@ BuildRequires: xz
 BuildRequires: /usr/bin/qemu-img
 BuildRequires: perl(Win::Hivex)
 BuildRequires: perl(Win::Hivex::Regedit)
+
 %if 0%{verify_tarball_signature}
 BuildRequires: gnupg2
 %endif
@@ -136,7 +147,6 @@ BuildRequires: ocaml-ocamldoc
 BuildRequires: ocaml-findlib-devel
 BuildRequires: ocaml-gettext-devel
 BuildRequires: ocaml-ounit-devel
-BuildRequires: ocaml-libvirt-devel >= 0.6.1.4-5
 BuildRequires: lua
 BuildRequires: lua-devel
 BuildRequires: perl-devel
@@ -150,7 +160,7 @@ BuildRequires: perl(Module::Build)
 BuildRequires: perl(ExtUtils::CBuilder)
 BuildRequires: perl(Locale::TextDomain)
 BuildRequires: python3-devel
-BuildRequires: libvirt-python3
+BuildRequires: python3-libvirt
 BuildRequires: ruby-devel
 BuildRequires: rubygem-rake
 # json is not pulled in automatically, see RHBZ#1325022
@@ -158,16 +168,16 @@ BuildRequires: rubygem(json)
 BuildRequires: rubygem(rdoc)
 BuildRequires: rubygem(test-unit)
 BuildRequires: ruby-irb
+%if !0%{?rhel}
 BuildRequires: php-devel
+%endif
 BuildRequires: gobject-introspection-devel
 BuildRequires: gjs
+%if !0%{?rhel}
 BuildRequires: vala
+%endif
 %ifarch %{golang_arches}
 BuildRequires: golang
-# This version is required for aarch64 to be supported by gcc-go.
-%ifarch aarch64
-BuildRequires: gcc >= 5.0.0-0.19.fc23
-%endif
 %endif
 
 # Build requirements for the appliance.
@@ -176,17 +186,106 @@ BuildRequires: gcc >= 5.0.0-0.19.fc23
 #   for f in `cat appliance/packagelist`; do echo $f; done | sort -u
 # However you have to edit the list down to packages which exist in
 # current Fedora, since supermin ignores non-existent packages.
-BuildRequires: acl attr augeas-libs bash binutils btrfs-progs bzip2 coreutils cpio cryptsetup curl debootstrap dhclient diffutils dosfstools e2fsprogs file findutils gawk gdisk genisoimage gfs2-utils grep gzip hivex iproute iputils jfsutils kernel kmod kpartx less libcap libldm libselinux libxml2 lsof lsscsi lvm2 lzop mdadm nilfs-utils openssh-clients parted pciutils pcre policycoreutils procps psmisc qemu-img reiserfs-utils rsync scrub sed sleuthkit squashfs-tools strace systemd tar udev util-linux vim-minimal which xfsprogs xz yajl zerofree
+
+BuildRequires: acl
+BuildRequires: attr
+BuildRequires: augeas-libs
+BuildRequires: bash
+BuildRequires: binutils
+%if !0%{?rhel}
+BuildRequires: btrfs-progs
+%endif
+BuildRequires: bzip2
+BuildRequires: coreutils
+BuildRequires: cpio
+BuildRequires: cryptsetup
+BuildRequires: curl
+%if !0%{?rhel}
+BuildRequires: debootstrap
+%endif
+BuildRequires: dhclient
+BuildRequires: diffutils
+BuildRequires: dosfstools
+BuildRequires: e2fsprogs
+BuildRequires: file
+BuildRequires: findutils
+BuildRequires: gawk
+BuildRequires: gdisk
+BuildRequires: genisoimage
+BuildRequires: gfs2-utils
+BuildRequires: grep
+BuildRequires: gzip
+%if !0%{?rhel}
 %ifnarch ppc
 BuildRequires: hfsplus-tools
 %endif
+%endif
+BuildRequires: hivex
+BuildRequires: iproute
+BuildRequires: iputils
+%if !0%{?rhel}
+BuildRequires: jfsutils
+%endif
+BuildRequires: kernel
+BuildRequires: kmod
+BuildRequires: kpartx
+BuildRequires: less
+BuildRequires: libcap
+%if !0%{?rhel}
+BuildRequires: libldm
+%endif
+BuildRequires: libselinux
+BuildRequires: libxml2
+BuildRequires: lsof
+BuildRequires: lsscsi
+BuildRequires: lvm2
+BuildRequires: lzop
+BuildRequires: mdadm
+%if !0%{?rhel}
+BuildRequires: nilfs-utils
+%endif
+%if !0%{?rhel}
+BuildRequires: ntfs-3g ntfsprogs ntfs-3g-system-compression
+%endif
+BuildRequires: openssh-clients
+BuildRequires: parted
+BuildRequires: pciutils
+BuildRequires: pcre
+BuildRequires: policycoreutils
+BuildRequires: procps
+BuildRequires: psmisc
+BuildRequires: qemu-img
+%if !0%{?rhel}
+BuildRequires: reiserfs-utils
+%endif
+BuildRequires: rsync
+BuildRequires: scrub
+BuildRequires: sed
+%if !0%{?rhel}
+BuildRequires: sleuthkit
+%endif
+BuildRequires: squashfs-tools
+BuildRequires: strace
+%ifarch %{ix86} x86_64
+BuildRequires: syslinux syslinux-extlinux
+%endif
+BuildRequires: systemd
+BuildRequires: tar
+BuildRequires: udev
+BuildRequires: util-linux
+BuildRequires: vim-minimal
+BuildRequires: which
+BuildRequires: xfsprogs
+BuildRequires: xz
+BuildRequires: yajl
+%if !0%{?rhel}
+BuildRequires: zerofree
+%endif
+%if !0%{?rhel}
 %ifnarch %{arm} aarch64 s390 s390x riscv64
 # http://zfs-fuse.net/issues/94
 BuildRequires: zfs-fuse
 %endif
-BuildRequires: ntfs-3g ntfsprogs ntfs-3g-system-compression
-%ifarch %{ix86} x86_64
-BuildRequires: syslinux syslinux-extlinux
 %endif
 
 # For building the appliance.
@@ -197,7 +296,7 @@ Requires:      supermin >= 5.1.18
 Requires:      augeas-libs%{?_isa} >= 1.7.0
 Requires:      libacl%{?_isa}
 Requires:      libcap%{?_isa}
-Requires:      hivex%{?_isa}
+Requires:      hivex%{?_isa} >= 1.3.10
 Requires:      pcre%{?_isa}
 Requires:      libselinux%{?_isa}
 Requires:      systemd-libs%{?_isa}
@@ -219,12 +318,17 @@ Suggests:      qemu-block-gluster
 Suggests:      qemu-block-iscsi
 Suggests:      qemu-block-rbd
 Suggests:      qemu-block-ssh
+Recommends:    libvirt-daemon-config-network
 Requires:      libvirt-daemon-driver-qemu
 Requires:      libvirt-daemon-driver-secret
 Recommends:    libvirt-daemon-driver-storage-core
-Recommends:    libvirt-daemon-config-network
+Requires:      libvirt-daemon-kvm >= 5.3.0
 Requires:      selinux-policy >= 3.11.1-63
 
+%ifarch aarch64
+Requires:      edk2-aarch64
+%endif
+
 # For UML backend (this backend only works on x86).
 # UML has been broken upstream (in the kernel) for a while, so don't
 # include this.  Note that uml_utilities also depends on Perl.
@@ -235,9 +339,14 @@ Requires:      selinux-policy >= 3.11.1-63
 # https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions
 Provides:      bundled(gnulib)
 
-# Someone managed to install libguestfs-winsupport (from RHEL!)  on
+%if !0%{?rhel}
+# Someone managed to install libguestfs-winsupport (from RHEL!) on
 # Fedora, which breaks everything.  Thus:
 Conflicts:     libguestfs-winsupport
+%else
+Conflicts:     libguestfs-winsupport < 7.2
+%endif
+
 
 
 %description
@@ -254,8 +363,7 @@ guest filesystem that Linux and qemu can, including but not limited
 to: ext2/3/4, btrfs, FAT and NTFS, LVM, many different disk partition
 schemes, qcow, qcow2, vmdk.
 
-Libguestfs for Fedora is split into several subpackages.  The basic
-subpackages are:
+Libguestfs is split into several subpackages.  The basic subpackages are:
 
                libguestfs  C library
          libguestfs-tools  virt-* tools, guestfish and guestmount (FUSE)
@@ -265,18 +373,28 @@ subpackages are:
 
 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
+%if !0%{?rhel}
            libguestfs-jfs  adds JFS support
          libguestfs-nilfs  adds NILFS v2 support
       libguestfs-reiserfs  adds ReiserFS support
+%endif
         libguestfs-rescue  enhances virt-rescue shell with more tools
          libguestfs-rsync  rsync to/from guest filesystems
+%if !0%{?rhel}
            libguestfs-ufs  adds UFS (BSD) support
+%endif
            libguestfs-xfs  adds XFS support
+%if !0%{?rhel}
            libguestfs-zfs  adds ZFS support
+%endif
 
 For developers:
 
@@ -291,10 +409,14 @@ Language bindings:
               lua-guestfs  Lua bindings
    ocaml-libguestfs-devel  OCaml bindings
          perl-Sys-Guestfs  Perl bindings
+%if !0%{?rhel}
            php-libguestfs  PHP bindings
+%endif
        python3-libguestfs  Python 3 bindings
           ruby-libguestfs  Ruby bindings
+%if !0%{?rhel}
           libguestfs-vala  Vala language bindings
+%endif
 
 
 %package devel
@@ -312,6 +434,7 @@ Requires:      %{name}-tools-c = %{epoch}:%{version}-%{release}
 for %{name}.
 
 
+%if !0%{?rhel}
 %package forensics
 Summary:       Filesystem forensics support for %{name}
 License:       LGPLv2+
@@ -320,6 +443,7 @@ Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 %description forensics
 This adds filesystem forensics support to %{name}.  Install it if you
 want to forensically analyze disk images using The Sleuth Kit.
+%endif
 
 
 %package gfs2
@@ -332,6 +456,7 @@ This adds GFS2 support to %{name}.  Install it if you want to process
 disk images containing GFS2.
 
 
+%if !0%{?rhel}
 %ifnarch ppc
 %package hfsplus
 Summary:       HFS+ support for %{name}
@@ -342,8 +467,10 @@ Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 This adds HFS+ support to %{name}.  Install it if you want to process
 disk images containing HFS+ / Mac OS Extended filesystems.
 %endif
+%endif
 
 
+%if !0%{?rhel}
 %package jfs
 Summary:       JFS support for %{name}
 License:       LGPLv2+
@@ -352,8 +479,10 @@ Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 %description jfs
 This adds JFS support to %{name}.  Install it if you want to process
 disk images containing JFS.
+%endif
 
 
+%if !0%{?rhel}
 %package nilfs
 Summary:       NILFS support for %{name}
 License:       LGPLv2+
@@ -362,8 +491,10 @@ Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 %description nilfs
 This adds NILFS v2 support to %{name}.  Install it if you want to process
 disk images containing NILFS v2.
+%endif
 
 
+%if !0%{?rhel}
 %package reiserfs
 Summary:       ReiserFS support for %{name}
 License:       LGPLv2+
@@ -372,6 +503,7 @@ Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 %description reiserfs
 This adds ReiserFS support to %{name}.  Install it if you want to process
 disk images containing ReiserFS.
+%endif
 
 
 %package rescue
@@ -394,6 +526,7 @@ This adds rsync support to %{name}.  Install it if you want to use
 rsync to upload or download files into disk images.
 
 
+%if !0%{?rhel}
 %package ufs
 Summary:       UFS (BSD) support for %{name}
 License:       LGPLv2+
@@ -402,6 +535,7 @@ Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 %description ufs
 This adds UFS support to %{name}.  Install it if you want to process
 disk images containing UFS (BSD filesystems).
+%endif
 
 
 %package xfs
@@ -414,6 +548,7 @@ This adds XFS support to %{name}.  Install it if you want to process
 disk images containing XFS.
 
 
+%if !0%{?rhel}
 %ifnarch %{arm} aarch64 s390 s390x riscv64
 %package zfs
 Summary:       ZFS support for %{name}
@@ -424,6 +559,7 @@ Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 This adds ZFS support to %{name}.  Install it if you want to process
 disk images containing ZFS.
 %endif
+%endif
 
 
 %package inspect-icons
@@ -460,7 +596,6 @@ Requires:      /usr/bin/vi
 
 # For virt-builder:
 Requires:      gnupg2
-#Requires:     (gnupg or gnupg2) # Fedora packaging rules forbid this
 Requires:      xz
 #Requires:     nbdkit, nbdkit-plugin-xz
 Requires:      curl
@@ -491,10 +626,6 @@ BuildArch:     noarch
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name}-tools-c = %{epoch}:%{version}-%{release}
 
-# NB: Only list deps here which are not picked up automatically.
-Requires:      perl(Sys::Virt)
-Requires:      perl(Win::Hivex) >= 1.2.7
-
 
 %description tools
 This package contains miscellaneous system administrator command line
@@ -654,6 +785,7 @@ Provides:      ruby(guestfs) = %{version}
 ruby-%{name} contains Ruby bindings for %{name}.
 
 
+%if !0%{?rhel}
 %package -n php-%{name}
 Summary:       PHP bindings for %{name}
 Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
@@ -662,6 +794,7 @@ Requires:	php(api) = %{php_core_api}
 
 %description -n php-%{name}
 php-%{name} contains PHP bindings for %{name}.
+%endif
 
 
 %package -n lua-guestfs
@@ -695,6 +828,7 @@ This package is needed if you want to write software using the
 GObject bindings.  It also contains GObject Introspection information.
 
 
+%if !0%{?rhel}
 %package vala
 Summary:       Vala for %{name}
 Requires:      %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
@@ -703,6 +837,7 @@ Requires:      vala
 
 %description vala
 %{name}-vala contains GObject bindings for %{name}.
+%endif
 
 
 
@@ -776,15 +911,26 @@ else
   # -n 1 because of RHBZ#980502.
   find /var/cache/{dnf,yum} -type f -name '*.rpm' -print0 | \
     xargs -0 -n 1 cp -t repo
-  createrepo repo
+  createrepo_c repo
   sed -e "s|@PWD@|$(pwd)|" %{SOURCE6} > yum.conf
   extra=--with-supermin-packager-config=$(pwd)/yum.conf
 fi
 
 %{configure} \
+%if 0%{?rhel}
+  QEMU=%{_libexecdir}/qemu-kvm \
+%endif
   PYTHON=%{__python3} \
   --with-default-backend=libvirt \
+%if !0%{?rhel}
   --with-extra="fedora=%{fedora},release=%{release},libvirt" \
+%else
+  --with-extra="rhel=%{rhel},release=%{release},libvirt" \
+%endif
+%if 0%{?rhel}
+  --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \
+  --disable-php \
+%endif
 %ifnarch %{golang_arches}
   --disable-golang \
 %endif
@@ -862,6 +1008,7 @@ gzip --best installed-docs/*.xml
 # Split up the monolithic packages file in the supermin appliance so
 # we can install dependencies in subpackages.
 pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d
+
 function move_to
 {
     if ! grep -Esq "^$1$" packages; then
@@ -872,17 +1019,24 @@ function move_to
     mv packages-t packages
     echo "$1" >> "$2"
 }
+
 move_to curl            zz-packages-dib
+%if !0%{?rhel}
 move_to debootstrap     zz-packages-dib
+%endif
 move_to kpartx          zz-packages-dib
 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
 move_to reiserfs-utils  zz-packages-reiserfs
+%endif
 move_to iputils         zz-packages-rescue
 move_to lsof            zz-packages-rescue
 move_to openssh-clients zz-packages-rescue
@@ -891,13 +1045,18 @@ move_to strace          zz-packages-rescue
 move_to vim-minimal     zz-packages-rescue
 move_to rsync           zz-packages-rsync
 move_to xfsprogs        zz-packages-xfs
+%if !0%{?rhel}
 %ifnarch %{arm} aarch64 s390 s390x riscv64
 move_to zfs-fuse        zz-packages-zfs
 %endif
+%endif
 
+%if !0%{?rhel}
 # On Fedora you need kernel-modules-extra to be able to mount
 # UFS (BSD) filesystems.
 echo "kernel-modules-extra" > zz-packages-ufs
+%endif
+
 popd
 
 # If there is a bogus dependency on kernel-*, rename it to 'kernel'
@@ -907,8 +1066,7 @@ popd
 # On all known architectures, depending on 'kernel' should
 # mean "we need a kernel".
 pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d
-sed 's/^kernel-.*/kernel/' < packages > packages-t
-mv packages-t packages
+sed -i 's/^kernel-.*/kernel/' packages
 popd
 
 # Guestfish colour prompts.
@@ -956,25 +1114,35 @@ rm ocaml/html/.gitignore
 %{_libdir}/pkgconfig/libguestfs.pc
 
 
+%if !0%{?rhel}
 %files forensics
 %{_libdir}/guestfs/supermin.d/zz-packages-forensics
+%endif
 
 %files gfs2
 %{_libdir}/guestfs/supermin.d/zz-packages-gfs2
 
+%if !0%{?rhel}
 %ifnarch ppc
 %files hfsplus
 %{_libdir}/guestfs/supermin.d/zz-packages-hfsplus
 %endif
+%endif
 
+%if !0%{?rhel}
 %files jfs
 %{_libdir}/guestfs/supermin.d/zz-packages-jfs
+%endif
 
+%if !0%{?rhel}
 %files nilfs
 %{_libdir}/guestfs/supermin.d/zz-packages-nilfs
+%endif
 
+%if !0%{?rhel}
 %files reiserfs
 %{_libdir}/guestfs/supermin.d/zz-packages-reiserfs
+%endif
 
 %files rsync
 %{_libdir}/guestfs/supermin.d/zz-packages-rsync
@@ -982,16 +1150,20 @@ rm ocaml/html/.gitignore
 %files rescue
 %{_libdir}/guestfs/supermin.d/zz-packages-rescue
 
+%if !0%{?rhel}
 %files ufs
 %{_libdir}/guestfs/supermin.d/zz-packages-ufs
+%endif
 
 %files xfs
 %{_libdir}/guestfs/supermin.d/zz-packages-xfs
 
+%if !0%{?rhel}
 %ifnarch %{arm} aarch64 s390 s390x riscv64
 %files zfs
 %{_libdir}/guestfs/supermin.d/zz-packages-zfs
 %endif
+%endif
 
 
 %files inspect-icons
@@ -1129,11 +1301,13 @@ rm ocaml/html/.gitignore
 %{_mandir}/man3/guestfs-ruby.3*
 
 
+%if !0%{?rhel}
 %files -n php-%{name}
 %doc php/README-PHP
 %dir %{_sysconfdir}/php.d
 %{_sysconfdir}/php.d/guestfs_php.ini
 %{_libdir}/php/modules/guestfs_php.so
+%endif
 
 
 %files -n lua-guestfs
@@ -1158,9 +1332,11 @@ rm ocaml/html/.gitignore
 %{_mandir}/man3/guestfs-gobject.3*
 
 
+%if !0%{?rhel}
 %files vala
 %{_datadir}/vala/vapi/libguestfs-gobject-1.0.deps
 %{_datadir}/vala/vapi/libguestfs-gobject-1.0.vapi
+%endif
 
 
 %ifarch %{golang_arches}
@@ -1185,10 +1361,19 @@ rm ocaml/html/.gitignore
 
 
 %changelog
+* Wed Jan 06 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.44.0-1
+- New upstream stable version 1.44.0.
+
+* Sat Sep 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.43.2-2
+- Rebuild for OCaml 4.11.1 in Fedora 33.
+
 * Mon Sep 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.43.2-1
 - New upstream version 1.43.2.
 - Replace libvirt-daemon-qemu with libvirt-daemon-kvm.
 
+* Wed Sep 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.43.1-7.1
+- Bump release and rebuild.
+
 * Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.43.1-7
 - OCaml 4.11.1 rebuild
 
@@ -1218,14 +1403,8 @@ rm ocaml/html/.gitignore
 * Wed May 06 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.42.0-6
 - Fix path to libguestfs appliance.
 
-* Tue May 05 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.42.0-5
-- OCaml 4.11.0+dev2-2020-04-22 rebuild
-
-* Wed Apr 22 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.42.0-4
-- OCaml 4.11.0 pre-release attempt 2
-
-* Sat Apr 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.42.0-3
-- Update all OCaml dependencies for RPM 4.16.
+* Thu Apr 16 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.42.0-3
+- Bump and rebuild to fix broken OCaml deps.
 
 * Thu Mar 12 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.42.1-1
 - Enable NTFS-3g system compression.

sources

@@ -1,2 +1,2 @@
-SHA512 (libguestfs-1.43.2.tar.gz) = a78ec3ce5a4851ff403cc1247082f0e0f847133733e6de7f181dc1a5069a4885d4091fc1ea26b06b2cab8b7e0ce5b4ffd2f4f02466fdf7139656e7b59fc6541b
-SHA512 (libguestfs-1.43.2.tar.gz.sig) = e46925c1f21750f0cb9a3a95390fccab38defb825cb004b36395fa17d6994fefcf64ba0bfc62dbc34a420b176319d9da6361b7ffeb4c070d62ffe3a8568d5d08
+SHA512 (libguestfs-1.44.0.tar.gz) = e5052d6deb130f9bceea06d2d6626162991cb83ffaf0ed9923ff5d8bb67137e565053104d8854d37ea8c871dce2a5ca29507d17357de813a8ac49896f00be103
+SHA512 (libguestfs-1.44.0.tar.gz.sig) = 26cb5b97dbc0d649466668964080220acc28c3fabc565563df0da5472420e61893907b4bedcb9f8977d7df9e867855d7178e4ad097df41dcbcaa98d0c07feac3