New upstream development version 1.29.11

Use new --disable-libguestfs-tests on non-guestfs arches.
This commit is contained in:
Richard W.M. Jones 2021-12-18 22:10:03 +00:00
parent eca1adb781
commit 560850cee6
2 changed files with 13 additions and 16 deletions

View File

@ -21,7 +21,8 @@
%global have_ocaml 1 %global have_ocaml 1
%endif %endif
# Architectures where the complete test suite must pass. # Architectures where we run the complete test suite including
# the libguestfs tests.
# #
# On all other architectures, a simpler test suite must pass. This # On all other architectures, a simpler test suite must pass. This
# omits any tests that run full qemu, since running qemu under TCG is # omits any tests that run full qemu, since running qemu under TCG is
@ -50,7 +51,7 @@ ExclusiveArch: x86_64
%global source_directory 1.29-development %global source_directory 1.29-development
Name: nbdkit Name: nbdkit
Version: 1.29.10 Version: 1.29.11
Release: 1%{?dist} Release: 1%{?dist}
Summary: NBD server Summary: NBD server
@ -77,9 +78,6 @@ BuildRequires: make
BuildRequires: autoconf, automake, libtool BuildRequires: autoconf, automake, libtool
%endif %endif
%ifnarch %{complete_test_arches}
BuildRequires: autoconf, automake, libtool
%endif
BuildRequires: gcc, gcc-c++ BuildRequires: gcc, gcc-c++
BuildRequires: %{_bindir}/pod2man BuildRequires: %{_bindir}/pod2man
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
@ -691,13 +689,6 @@ for %{name}.
autoreconf -i autoreconf -i
%endif %endif
%ifnarch %{complete_test_arches}
# Simplify the test suite so it doesn't require qemu.
sed -i -e 's/^LIBGUESTFS_TESTS/xLIBGUESTFS_TESTS/' tests/Makefile.am
sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am
autoreconf -i
%endif
%build %build
# Golang bindings are not enabled in the build since they don't # Golang bindings are not enabled in the build since they don't
@ -727,6 +718,11 @@ export PYTHON=%{__python3}
--with-libguestfs \ --with-libguestfs \
%else %else
--without-libguestfs \ --without-libguestfs \
%endif
%ifarch %{complete_test_arches}
--enable-libguestfs-tests \
%else
--disable-libguestfs-tests \
%endif %endif
--with-tls-priority=@NBDKIT,SYSTEM --with-tls-priority=@NBDKIT,SYSTEM
@ -1196,8 +1192,9 @@ export LIBGUESTFS_TRACE=1
%changelog %changelog
* Sat Dec 18 2021 Richard W.M. Jones <rjones@redhat.com> - 1.29.10-1 * Sat Dec 18 2021 Richard W.M. Jones <rjones@redhat.com> - 1.29.11-1
- New upstream development version 1.29.10 - New upstream development version 1.29.11
- Use new --disable-libguestfs-tests on non-guestfs arches.
* Tue Dec 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.29.9-1 * Tue Dec 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1.29.9-1
- New upstream development version 1.29.9 - New upstream development version 1.29.9

View File

@ -1,2 +1,2 @@
SHA512 (nbdkit-1.29.10.tar.gz) = c2e5891eff471ab80e364c5258a305bd20e11c0059f415ff2aa23ec03ceb52630eb5448684ffffcf50cc97515e4c63889349ae577c13bd61bf9e06cd4a08f2c9 SHA512 (nbdkit-1.29.11.tar.gz) = 923e07db9f4bde4b8a110020a7301c11a1c7e6ad39a02d199c63b4330924f9da1235528b1b70d5c01686740d1e0ff041e2a93c66381db90364f811c39772a8cc
SHA512 (nbdkit-1.29.10.tar.gz.sig) = d3e5e7a1bf92652c96e3ac91f039fa9cfad0381039af3a1475eea06ad6eddb0b2a9a0314a2199e1b0cc4b0da090c491741fa2b289a37cb3aede5e58d77ddd861 SHA512 (nbdkit-1.29.11.tar.gz.sig) = 1a62d33abe12bb1494722be6c631f30ffdf33d7a9d20e3674451639fa0a25f3c8304fb1dbd8cc345c8167a89cb7d77235afd859b368369821fa39d5f9c93f8d0