Fix a changelog entry

Require libvirt >= 11.10.0, qemu >= 7.2.0 and passt.

libguestfs.spec

@@ -13,14 +13,7 @@ ExcludeArch: %{ix86}
 # we only do a sanity check that kernel/qemu/libvirt/appliance is not
 # broken.  To perform the full test suite, see instructions here:
 # https://www.redhat.com/archives/libguestfs/2015-September/msg00078.html
-%if !0%{?rhel}
 %global test_arches aarch64 %{power64} s390x x86_64
-%else
-# RHEL 9 only:
-# x86-64:  "/lib64/libc.so.6: CPU ISA level is lower than required"
-#          (RHBZ#1919389)
-%global test_arches NONE
-%endif
 
 # Trim older changelog entries.
 # https://lists.fedoraproject.org/pipermail/devel/2013-April/thread.html#181627
@@ -30,7 +23,7 @@ ExcludeArch: %{ix86}
 %global verify_tarball_signature 1
 
 # The source directory.
-%global source_directory 1.55-development
+%global source_directory 1.58-stable
 
 # Filter perl provides.
 %{?perl_default_filter}
@@ -41,8 +34,8 @@ ExcludeArch: %{ix86}
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.55.3
-Release:       1%{?dist}
+Version:       1.58.0
+Release:       2%{?dist}
 License:       LGPL-2.1-or-later
 
 # Build only for architectures that have a kernel
@@ -101,15 +94,11 @@ BuildRequires: libselinux-utils
 BuildRequires: libselinux-devel
 BuildRequires: fuse, fuse-devel
 BuildRequires: pcre2-devel
-BuildRequires: file-devel
-BuildRequires: libvirt-devel
+BuildRequires: libvirt-devel >= 11.10.0
 BuildRequires: gperf
-BuildRequires: flex
-BuildRequires: bison
 BuildRequires: rpm-devel
 BuildRequires: cpio
 BuildRequires: libconfig-devel
-BuildRequires: xz-devel
 %if !0%{?rhel}
 BuildRequires: zip
 BuildRequires: unzip
@@ -117,7 +106,7 @@ BuildRequires: unzip
 BuildRequires: systemd-units
 BuildRequires: netpbm-progs
 BuildRequires: icoutils
-BuildRequires: libvirt-daemon-kvm >= 7.1.0
+BuildRequires: libvirt-daemon-kvm
 %if !0%{?rhel}
 BuildRequires: perl(Expect)
 %endif
@@ -128,13 +117,16 @@ BuildRequires: libldm-devel
 %endif
 BuildRequires: json-c-devel
 BuildRequires: systemd-devel
+BuildRequires: bash-completion
+%if 0%{?fedora} || 0%{?rhel} >= 11
 BuildRequires: bash-completion-devel
+%endif
 BuildRequires: /usr/bin/ping
 BuildRequires: curl
 BuildRequires: xz
 BuildRequires: zstd
 BuildRequires: libzstd-devel
-BuildRequires: /usr/bin/qemu-img
+BuildRequires: qemu-img >= 7.2.0
 
 %if 0%{verify_tarball_signature}
 BuildRequires: gnupg2
@@ -145,7 +137,6 @@ BuildRequires: ocaml >= 4.08
 BuildRequires: ocaml-ocamldoc
 BuildRequires: ocaml-findlib-devel
 %if !0%{?rhel}
-BuildRequires: ocaml-ounit-devel
 BuildRequires: lua
 BuildRequires: lua-devel
 %endif
@@ -167,7 +158,7 @@ BuildRequires: rubygem-rake
 BuildRequires: rubygem(json)
 BuildRequires: rubygem(rdoc)
 BuildRequires: rubygem(test-unit)
-BuildRequires: ruby-irb
+BuildRequires: rubygem(irb)
 BuildRequires: php-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gjs
@@ -266,12 +257,6 @@ BuildRequires: xz
 %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
-%endif
 BuildRequires: zstd
 
 # Main package requires the appliance.  This allows the appliance to
@@ -298,7 +283,7 @@ Requires:      systemd-libs%{?_isa}
 Requires:      fuse
 
 # For core APIs:
-Requires:      /usr/bin/qemu-img
+Requires:      qemu-img
 Requires:      coreutils
 Requires:      grep
 Requires:      tar
@@ -307,7 +292,7 @@ Requires:      tar
 Requires:      xz
 
 # For qemu direct and libvirt backends.
-Requires:      qemu-kvm-core
+Requires:      qemu-kvm-core >= 7.2.0
 %if !0%{?rhel}
 Suggests:      qemu-block-curl
 Suggests:      qemu-block-iscsi
@@ -317,10 +302,10 @@ Suggests:      qemu-block-rbd
 Suggests:      qemu-block-ssh
 %endif
 Recommends:    libvirt-daemon-config-network
-Requires:      libvirt-daemon-driver-qemu >= 7.1.0
+Requires:      libvirt-daemon-driver-qemu >= 11.10.0
 Requires:      libvirt-daemon-driver-secret
 Requires:      libvirt-daemon-driver-storage-core
-Recommends:    passt
+Requires:      passt
 Requires:      (selinux-policy >= 3.11.1-63 if selinux-policy)
 
 %ifarch aarch64
@@ -366,9 +351,6 @@ For enhanced features, install:
            libguestfs-ufs  adds UFS (BSD) support
 %endif
            libguestfs-xfs  adds XFS support
-%if !0%{?rhel}
-           libguestfs-zfs  adds ZFS support
-%endif
 
 For developers:
 
@@ -499,20 +481,6 @@ 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}
-License:       GPL-2.0-or-later
-Requires:      %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-
-%description zfs
-This adds ZFS support to %{name}.  Install it if you want to process
-disk images containing ZFS.
-%endif
-%endif
-
-
 %package inspect-icons
 Summary:       Additional dependencies for inspecting guest icons
 License:       LGPL-2.1-or-later
@@ -693,6 +661,9 @@ for %{name}.
 %setup -q
 %autopatch -p1
 
+# ACLOCAL_PATH is temporarily required to work around
+# https://bugzilla.redhat.com/show_bug.cgi?id=2366708
+export ACLOCAL_PATH=/usr/share/gettext/m4/
 autoreconf -fiv
 
 # For sVirt to work, the local temporary directory we use in the tests
@@ -782,6 +753,15 @@ if ! make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then
     cat $HOME/.cache/libvirt/qemu/log/*
     exit 1
 fi
+
+# As libvirt is the default backend, test that the direct backend
+# works too.  It's a good place to get test coverage across all the
+# architectures.
+if ! LIBGUESTFS_BACKEND=direct \
+     make quickcheck QUICKCHECK_TEST_TOOL_ARGS="-t 1200"; then
+    cat $HOME/.cache/libvirt/qemu/log/*
+    exit 1
+fi
 %endif
 
 
@@ -851,13 +831,6 @@ 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
-%else
-remove zfs-fuse
-%endif
 
 %if !0%{?rhel}
 # On Fedora you need kernel-modules-extra to be able to mount
@@ -975,19 +948,12 @@ rm ocaml/html/.gitignore
 %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
 # no files
 
 
 %files bash-completion
+%if 0%{?fedora} || 0%{?rhel} >= 11
 %dir %{bash_completions_dir}
 %{bash_completions_dir}/guestfish
 %{bash_completions_dir}/guestmount
@@ -998,6 +964,18 @@ rm ocaml/html/.gitignore
 %{bash_completions_dir}/virt-rescue
 %{bash_completions_dir}/virt-tar-in
 %{bash_completions_dir}/virt-tar-out
+%else
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/guestfish
+%{_datadir}/bash-completion/completions/guestmount
+%{_datadir}/bash-completion/completions/guestunmount
+%{_datadir}/bash-completion/completions/libguestfs-test-tool
+%{_datadir}/bash-completion/completions/virt-copy-in
+%{_datadir}/bash-completion/completions/virt-copy-out
+%{_datadir}/bash-completion/completions/virt-rescue
+%{_datadir}/bash-completion/completions/virt-tar-in
+%{_datadir}/bash-completion/completions/virt-tar-out
+%endif
 
 
 %files -n ocaml-%{name}
@@ -1104,6 +1082,131 @@ rm ocaml/html/.gitignore
 
 
 %changelog
+* Thu Jan 08 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1:1.58.0-2
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0
+
+* Mon Jan 05 2026 Richard W.M. Jones <rjones@redhat.com> - 1:1.58.0-1
+- New upstream development version 1.58.0
+- Require libvirt >= 11.10.0, qemu >= 7.2.0 and passt.
+
+* Wed Dec 17 2025 Tom Callaway <spot@fedoraproject.org> - 1:1.57.7-2
+- rebuild for new libconfig
+
+* Thu Dec 04 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.7-1
+- New upstream development version 1.57.7
+
+* Tue Nov 04 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.6-1
+- New upstream development version 1.57.6
+
+* Fri Oct 17 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.5-1
+- New upstream development version 1.57.5
+- Test direct backend in %%check
+
+* Wed Oct 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.4-4
+- Require passt
+- https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/YDHKKQSDURTMSKSN6GW3QGQI43DTFXNH/
+
+* Wed Oct 15 2025 Remi Collet <remi@remirepo.net> - 1:1.57.4-3
+- rebuild for https://fedoraproject.org/wiki/Changes/php85
+
+* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.4-2
+- OCaml 5.4.0 rebuild
+
+* Tue Sep 30 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.4-1
+- New upstream development version 1.57.4
+- Enable aarch64 tests
+
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1:1.57.3-2
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Tue Sep 09 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.3-1
+- New upstream development version 1.57.3
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1:1.57.2-2
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Fri Aug 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.2-1
+- New upstream development version 1.57.2
+
+* Wed Aug 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.57.1-1
+- New upstream development version 1.57.1
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.56.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jul 12 2025 Jerry James <loganjerry@gmail.com> - 1:1.56.1-3
+- Rebuild to fix OCaml dependencies
+
+* Mon Jul 07 2025 Jitka Plesnikova <jplesnik@redhat.com> - 1:1.56.1-2
+- Perl 5.42 rebuild
+
+* Mon Jun 16 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.56.1-1
+- New upstream stable version 1.56.1
+- Remove upstream ACPI / seabios fixes included in this version.
+
+* Wed Jun 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.56.0-1
+- New upstream stable version 1.56.0
+- Remove BR xz-devel as it is not needed.
+
+* Fri Jun 06 2025 Python Maint <python-maint@redhat.com> - 1:1.55.14-2
+- Rebuilt for Python 3.14
+
+* Tue Jun 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.14-1
+- New upstream development version 1.55.14
+
+* Mon Jun 02 2025 Python Maint <python-maint@redhat.com> - 1:1.55.13-2
+- Rebuilt for Python 3.14
+
+* Tue May 20 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.13-1
+- New upstream development version 1.55.13
+
+* Mon May 19 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.12-1
+- New upstream development version 1.55.12
+
+* Fri May 09 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.11-2
+- New upstream development version 1.55.11
+- Backport upstream patch to really remove zfs-fuse dependency
+
+* Wed May 07 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.10-2
+- Remove file-devel BR
+- Remove libguestfs-zfs subpackage
+
+* Sat Apr 26 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.10-1
+- New upstream development version 1.55.10
+- Fix macro in comment
+
+* Wed Apr 16 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.9-1
+- New upstream development version 1.55.9
+- Remove flex and bison
+
+* Thu Apr 03 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.8-1
+- New upstream development version 1.55.8
+- Remove oUnit
+
+* Tue Mar 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.7-1
+- New upstream development version 1.55.7
+
+* Wed Feb 19 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.6-1
+- New upstream development version 1.55.6
+
+* Tue Feb 18 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.5-1
+- New upstream development version 1.55.5
+
+* Wed Feb 05 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.4-1
+- New upstream development version 1.55.4
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.55.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:1.55.3-4
+- Rebuilt for the bin-sbin merge (2nd attempt)
+
+* Fri Jan 10 2025 Jerry James <loganjerry@gmail.com> - 1:1.55.3-3
+- OCaml 5.3.0 rebuild for Fedora 42
+
+* Thu Jan 09 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.3-2
+- Rebuild for Ruby 3.4 again (RHBZ#2336525)
+
 * Wed Jan 08 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.3-1
 - New upstream development version 1.55.3
 - Baseline version of OCaml moved to 4.08

sources

@@ -1,2 +1,2 @@
-SHA512 (libguestfs-1.55.3.tar.gz) = 88f8f6e55cd52904193cf4c026ebbe34c25c707bf6bf0a34ac1d6e4a9c9f69b478e55eb46581ea47e820015ca432c38ec6252007f00394f297003596567d2bf0
-SHA512 (libguestfs-1.55.3.tar.gz.sig) = 7fd680e69f4a226ca8dbbc9862347bd169a669f436fd191de2702b2ed56c4f21e81540ed5dca659852362dccfccb952c0377506409070c82ce0e803e4f6d78b1
+SHA512 (libguestfs-1.58.0.tar.gz) = 67abbd37fe64935ae5cca13dbe1860fe2eab9df492fd134eacbdc1831e6034c849855e76118ce0002d3ac83205122947582dbe47b66f12b94dcb51155881501a
+SHA512 (libguestfs-1.58.0.tar.gz.sig) = e07758ed3901f9ae95dace16cbb4de194dbbde788155efcde7982226785928d1805af6939f201d74770923ad55997f1d465f9594cb81bc2435c0ea882ce546d8

tests/run-libguestfs-test-tool.sh

@@ -0,0 +1,10 @@
+#!/bin/bash -
+set -e
+set -x
+
+# This only makes sure that libguestfs isn't totally broken.
+
+# Fix libvirt.
+systemctl restart virtqemud virtsecretd virtstoraged virtnetworkd
+
+libguestfs-test-tool

tests/tests.yml

@@ -5,9 +5,10 @@
   - role: standard-test-basic
     tags:
     - classic
+    required_packages:
+    - libguestfs
+    - libvirt-daemon-kvm
     tests:
     - libguestfs-test-tool:
         dir: .
-        run: libguestfs-test-tool
-    required_packages:
-    - libguestfs
+        run: ./run-libguestfs-test-tool.sh