From 560850cee6851220dc0175acfa34e8ab241cf8d1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 18 Dec 2021 22:10:03 +0000
Subject: [PATCH] New upstream development version 1.29.11

Use new --disable-libguestfs-tests on non-guestfs arches.
---
 nbdkit.spec | 25 +++++++++++--------------
 sources     |  4 ++--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/nbdkit.spec b/nbdkit.spec
index e632dfc..a24d128 100644
--- a/nbdkit.spec
+++ b/nbdkit.spec
@@ -21,7 +21,8 @@
 %global have_ocaml 1
 %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
 # 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
 
 Name:           nbdkit
-Version:        1.29.10
+Version:        1.29.11
 Release:        1%{?dist}
 Summary:        NBD server
 
@@ -77,9 +78,6 @@ BuildRequires: make
 BuildRequires:  autoconf, automake, libtool
 %endif
 
-%ifnarch %{complete_test_arches}
-BuildRequires:  autoconf, automake, libtool
-%endif
 BuildRequires:  gcc, gcc-c++
 BuildRequires:  %{_bindir}/pod2man
 BuildRequires:  gnutls-devel
@@ -691,13 +689,6 @@ for %{name}.
 autoreconf -i
 %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
 # Golang bindings are not enabled in the build since they don't
@@ -727,6 +718,11 @@ export PYTHON=%{__python3}
     --with-libguestfs \
 %else
     --without-libguestfs \
+%endif
+%ifarch %{complete_test_arches}
+    --enable-libguestfs-tests \
+%else
+    --disable-libguestfs-tests \
 %endif
     --with-tls-priority=@NBDKIT,SYSTEM
 
@@ -1196,8 +1192,9 @@ export LIBGUESTFS_TRACE=1
 
 
 %changelog
-* Sat Dec 18 2021 Richard W.M. Jones <rjones@redhat.com> - 1.29.10-1
-- New upstream development version 1.29.10
+* Sat Dec 18 2021 Richard W.M. Jones <rjones@redhat.com> - 1.29.11-1
+- 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
 - New upstream development version 1.29.9
diff --git a/sources b/sources
index 797a3b1..9aa7ad7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (nbdkit-1.29.10.tar.gz) = c2e5891eff471ab80e364c5258a305bd20e11c0059f415ff2aa23ec03ceb52630eb5448684ffffcf50cc97515e4c63889349ae577c13bd61bf9e06cd4a08f2c9
-SHA512 (nbdkit-1.29.10.tar.gz.sig) = d3e5e7a1bf92652c96e3ac91f039fa9cfad0381039af3a1475eea06ad6eddb0b2a9a0314a2199e1b0cc4b0da090c491741fa2b289a37cb3aede5e58d77ddd861
+SHA512 (nbdkit-1.29.11.tar.gz) = 923e07db9f4bde4b8a110020a7301c11a1c7e6ad39a02d199c63b4330924f9da1235528b1b70d5c01686740d1e0ff041e2a93c66381db90364f811c39772a8cc
+SHA512 (nbdkit-1.29.11.tar.gz.sig) = 1a62d33abe12bb1494722be6c631f30ffdf33d7a9d20e3674451639fa0a25f3c8304fb1dbd8cc345c8167a89cb7d77235afd859b368369821fa39d5f9c93f8d0