diff --git a/libguestfs.spec b/libguestfs.spec index 66ef8e2..ee5734c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -13,7 +13,14 @@ 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 @@ -23,7 +30,7 @@ ExcludeArch: %{ix86} %global verify_tarball_signature 1 # The source directory. -%global source_directory 1.58-stable +%global source_directory 1.56-stable # Filter perl provides. %{?perl_default_filter} @@ -34,8 +41,8 @@ ExcludeArch: %{ix86} Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.58.0 -Release: 2%{?dist} +Version: 1.56.2 +Release: 1%{?dist} License: LGPL-2.1-or-later # Build only for architectures that have a kernel @@ -94,7 +101,7 @@ BuildRequires: libselinux-utils BuildRequires: libselinux-devel BuildRequires: fuse, fuse-devel BuildRequires: pcre2-devel -BuildRequires: libvirt-devel >= 11.10.0 +BuildRequires: libvirt-devel BuildRequires: gperf BuildRequires: rpm-devel BuildRequires: cpio @@ -106,7 +113,7 @@ BuildRequires: unzip BuildRequires: systemd-units BuildRequires: netpbm-progs BuildRequires: icoutils -BuildRequires: libvirt-daemon-kvm +BuildRequires: libvirt-daemon-kvm >= 7.1.0 %if !0%{?rhel} BuildRequires: perl(Expect) %endif @@ -117,16 +124,13 @@ 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: qemu-img >= 7.2.0 +BuildRequires: /usr/bin/qemu-img %if 0%{verify_tarball_signature} BuildRequires: gnupg2 @@ -158,7 +162,7 @@ BuildRequires: rubygem-rake BuildRequires: rubygem(json) BuildRequires: rubygem(rdoc) BuildRequires: rubygem(test-unit) -BuildRequires: rubygem(irb) +BuildRequires: ruby-irb BuildRequires: php-devel BuildRequires: gobject-introspection-devel BuildRequires: gjs @@ -283,7 +287,7 @@ Requires: systemd-libs%{?_isa} Requires: fuse # For core APIs: -Requires: qemu-img +Requires: /usr/bin/qemu-img Requires: coreutils Requires: grep Requires: tar @@ -292,7 +296,7 @@ Requires: tar Requires: xz # For qemu direct and libvirt backends. -Requires: qemu-kvm-core >= 7.2.0 +Requires: qemu-kvm-core %if !0%{?rhel} Suggests: qemu-block-curl Suggests: qemu-block-iscsi @@ -302,10 +306,10 @@ Suggests: qemu-block-rbd Suggests: qemu-block-ssh %endif Recommends: libvirt-daemon-config-network -Requires: libvirt-daemon-driver-qemu >= 11.10.0 +Requires: libvirt-daemon-driver-qemu >= 7.1.0 Requires: libvirt-daemon-driver-secret Requires: libvirt-daemon-driver-storage-core -Requires: passt +Recommends: passt Requires: (selinux-policy >= 3.11.1-63 if selinux-policy) %ifarch aarch64 @@ -661,9 +665,6 @@ 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 @@ -753,15 +754,6 @@ 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 @@ -953,7 +945,6 @@ rm ocaml/html/.gitignore %files bash-completion -%if 0%{?fedora} || 0%{?rhel} >= 11 %dir %{bash_completions_dir} %{bash_completions_dir}/guestfish %{bash_completions_dir}/guestmount @@ -964,18 +955,6 @@ 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} @@ -1082,63 +1061,8 @@ rm ocaml/html/.gitignore %changelog -* Thu Jan 08 2026 Mamoru TASAKA - 1:1.58.0-2 -- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 - -* Mon Jan 05 2026 Richard W.M. Jones - 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 - 1:1.57.7-2 -- rebuild for new libconfig - -* Thu Dec 04 2025 Richard W.M. Jones - 1:1.57.7-1 -- New upstream development version 1.57.7 - -* Tue Nov 04 2025 Richard W.M. Jones - 1:1.57.6-1 -- New upstream development version 1.57.6 - -* Fri Oct 17 2025 Richard W.M. Jones - 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 - 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 - 1:1.57.4-3 -- rebuild for https://fedoraproject.org/wiki/Changes/php85 - -* Mon Oct 13 2025 Richard W.M. Jones - 1:1.57.4-2 -- OCaml 5.4.0 rebuild - -* Tue Sep 30 2025 Richard W.M. Jones - 1:1.57.4-1 -- New upstream development version 1.57.4 -- Enable aarch64 tests - -* Fri Sep 19 2025 Python Maint - 1:1.57.3-2 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Tue Sep 09 2025 Richard W.M. Jones - 1:1.57.3-1 -- New upstream development version 1.57.3 - -* Fri Aug 15 2025 Python Maint - 1:1.57.2-2 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Fri Aug 15 2025 Richard W.M. Jones - 1:1.57.2-1 -- New upstream development version 1.57.2 - -* Wed Aug 13 2025 Richard W.M. Jones - 1:1.57.1-1 -- New upstream development version 1.57.1 - -* Thu Jul 24 2025 Fedora Release Engineering - 1:1.56.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jul 12 2025 Jerry James - 1:1.56.1-3 -- Rebuild to fix OCaml dependencies - -* Mon Jul 07 2025 Jitka Plesnikova - 1:1.56.1-2 -- Perl 5.42 rebuild +* Wed Aug 13 2025 Richard W.M. Jones - 1:1.56.2-1 +- New upstream stable version 1.56.2 * Mon Jun 16 2025 Richard W.M. Jones - 1:1.56.1-1 - New upstream stable version 1.56.1 @@ -1148,32 +1072,22 @@ rm ocaml/html/.gitignore - New upstream stable version 1.56.0 - Remove BR xz-devel as it is not needed. -* Fri Jun 06 2025 Python Maint - 1:1.55.14-2 -- Rebuilt for Python 3.14 - * Tue Jun 03 2025 Richard W.M. Jones - 1:1.55.14-1 - New upstream development version 1.55.14 -* Mon Jun 02 2025 Python Maint - 1:1.55.13-2 -- Rebuilt for Python 3.14 - * Tue May 20 2025 Richard W.M. Jones - 1:1.55.13-1 - New upstream development version 1.55.13 * Mon May 19 2025 Richard W.M. Jones - 1:1.55.12-1 - New upstream development version 1.55.12 - -* Fri May 09 2025 Richard W.M. Jones - 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 - 1:1.55.10-2 -- Remove file-devel BR - Remove libguestfs-zfs subpackage +* Fri May 09 2025 Richard W.M. Jones - 1:1.55.11-1 +- New upstream development version 1.55.11 +- Remove file-devel BR + * Sat Apr 26 2025 Richard W.M. Jones - 1:1.55.10-1 - New upstream development version 1.55.10 -- Fix macro in comment * Wed Apr 16 2025 Richard W.M. Jones - 1:1.55.9-1 - New upstream development version 1.55.9 @@ -1195,17 +1109,8 @@ rm ocaml/html/.gitignore * Wed Feb 05 2025 Richard W.M. Jones - 1:1.55.4-1 - New upstream development version 1.55.4 -* Fri Jan 17 2025 Fedora Release Engineering - 1:1.55.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 1:1.55.3-4 -- Rebuilt for the bin-sbin merge (2nd attempt) - -* Fri Jan 10 2025 Jerry James - 1:1.55.3-3 -- OCaml 5.3.0 rebuild for Fedora 42 - -* Thu Jan 09 2025 Richard W.M. Jones - 1:1.55.3-2 -- Rebuild for Ruby 3.4 again (RHBZ#2336525) +* Wed Jan 29 2025 Jerry James - 1:1.55.3-2 +- OCaml 5.2.1 rebuild for Fedora 41 * Wed Jan 08 2025 Richard W.M. Jones - 1:1.55.3-1 - New upstream development version 1.55.3 diff --git a/sources b/sources index 23cf369..80ffaaa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.58.0.tar.gz) = 67abbd37fe64935ae5cca13dbe1860fe2eab9df492fd134eacbdc1831e6034c849855e76118ce0002d3ac83205122947582dbe47b66f12b94dcb51155881501a -SHA512 (libguestfs-1.58.0.tar.gz.sig) = e07758ed3901f9ae95dace16cbb4de194dbbde788155efcde7982226785928d1805af6939f201d74770923ad55997f1d465f9594cb81bc2435c0ea882ce546d8 +SHA512 (libguestfs-1.56.2.tar.gz) = 80d99319bc6d13f0f4252c21250d4191a9dec94c6d10b572806043f3ecc36581c2169ddac4ebf7c7c7a1a560c6e85c5ce366baea2e63efcaa093f601d1031c62 +SHA512 (libguestfs-1.56.2.tar.gz.sig) = 487be28959690b66b430732811af1eb9aa1b5052f756bfa1ff528d3931087492a72c809072df2654a7908ee0d248e0daa986bcb43bd8040f9ee20f9208401118 diff --git a/tests/run-libguestfs-test-tool.sh b/tests/run-libguestfs-test-tool.sh deleted file mode 100755 index d36d5ea..0000000 --- a/tests/run-libguestfs-test-tool.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 diff --git a/tests/tests.yml b/tests/tests.yml index 3809111..180fe76 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -5,10 +5,9 @@ - role: standard-test-basic tags: - classic - required_packages: - - libguestfs - - libvirt-daemon-kvm tests: - libguestfs-test-tool: dir: . - run: ./run-libguestfs-test-tool.sh + run: libguestfs-test-tool + required_packages: + - libguestfs