Make nbdkit-plugin-tar require nbdkit-plugin-perl.

The tar plugin is written in Perl and so won't work unless the Perl
plugin is also installed.

This dependency should be generated automatically, but for now we add
it manually.

(cherry picked from commit eb867f6953)

.gitignore

@@ -1,2 +1,3 @@
 /clog
 /nbdkit-*.tar.gz
+/nbdkit-*.tar.gz.sig

nbdkit.spec

@@ -9,22 +9,40 @@
 # On all other architectures, a simpler test suite must pass.  This
 # omits any tests that run full qemu, since running qemu under TCG is
 # often broken on non-x86_64 arches.
-%global complete_test_arches aarch64 x86_64
+%global complete_test_arches x86_64
 
 # Currently everything has Python 2.  RHEL 7 doesn't have Python 3.
 %if 0%{?rhel} != 7
 %global have_python3 1
 %endif
 
+# If we should verify tarball signature with GPGv2.
+%global verify_tarball_signature 1
+
+# If there are patches which touch autotools files, set this to 1.
+%global patches_touch_autotools %{nil}
+
+# The source directory.
+%global source_directory 1.2-stable
+
 Name:           nbdkit
-Version:        1.1.28
-Release:        5%{?dist}
+Version:        1.2.6
+Release:        1%{?dist}
 Summary:        NBD server
 
 License:        BSD
 URL:            https://github.com/libguestfs/nbdkit
 
-Source0:        http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz
+Source0:        http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz
+%if 0%{verify_tarball_signature}
+Source1:        http://libguestfs.org/download/nbdkit/%{source_directory}/%{name}-%{version}.tar.gz.sig
+# Keyring used to verify tarball signature.
+Source2:       libguestfs.keyring
+%endif
+
+%if 0%{patches_touch_autotools}
+BuildRequires: autoconf, automake, libtool
+%endif
 
 %if 0%{?rhel} == 7
 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and
@@ -59,6 +77,9 @@ BuildRequires:  python3-devel
 BuildRequires:  ocaml >= 4.02.2
 %endif
 BuildRequires:  ruby-devel
+%if 0%{verify_tarball_signature}
+BuildRequires: gnupg2
+%endif
 
 # Only for running the test suite:
 BuildRequires:  /usr/bin/certtool
@@ -300,6 +321,8 @@ Summary:        Tar archive plugin for %{name}
 License:        BSD
 
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+# XXX This dependency should be autogenerated.
+Requires:       %{name}-plugin-perl
 
 
 %description plugin-tar
@@ -364,12 +387,19 @@ plugins for %{name}.
 
 
 %prep
-%setup -q
-%autopatch -p1
+%if 0%{verify_tarball_signature}
+tmphome="$(mktemp -d)"
+gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%endif
+%autosetup -p1
+%if 0%{patches_touch_autotools}
+autoreconf -i
+%endif
 
 %ifnarch %{complete_test_arches}
 # Simplify the test suite so it doesn't require qemu.
 sed -i -e '/^if HAVE_LIBGUESTFS/,/^endif HAVE_LIBGUESTFS/d' tests/Makefile.am
+sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am
 autoreconf -i
 %endif
 
@@ -617,6 +647,39 @@ popd
 
 
 %changelog
+* Wed Aug  1 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.6-1
+- New upstream version 1.2.6.
+
+* Wed Jul 25 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.5-1
+- New stable version 1.2.5.
+- Small refactorings in the spec file.
+
+* Sun Jul  1 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-3
+- Add all upstream patches since 1.2.4 was released.
+
+* Tue Jun 12 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-2
+- Add all upstream patches since 1.2.4 was released.
+
+* Sat Jun  9 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.4-1
+- New stable version 1.2.4.
+- Remove upstream patches.
+- Enable tarball signatures.
+- Add upstream patch to fix tests when guestfish not available.
+
+* Wed Jun  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-1
+- New stable version 1.2.3.
+- Add patch to work around libvirt problem with relative socket paths.
+- Add patch to fix the xz plugin test with recent guestfish.
+
+* Sat Apr 21 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-1
+- New stable version 1.2.2.
+
+* Mon Apr  9 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-1
+- New stable version 1.2.1.
+
+* Fri Apr  6 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-1
+- Move to stable branch version 1.2.0.
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1.28-5
 - Escape macros in %%changelog
 

sources

@@ -1 +1,2 @@
-SHA512 (nbdkit-1.1.28.tar.gz) = cbf40dffc773575a69d20edc42570bf63bd5f189ec0a3c4beeca7fca518ec969b94a15fdc834762f322c99145a95a015f5aad60edb078ba98c7b805583218fef
+SHA512 (nbdkit-1.2.6.tar.gz) = 0eb171bb1f8f0bda9b424605512e90f16a30b2a11ae980c600c32309c667a99cedcd974adbd80c85fbf298f0b44b49974bade8164c0035fd8c96cd6e352d9421
+SHA512 (nbdkit-1.2.6.tar.gz.sig) = f69df2c4656d9c3ca12b0a487631ef4a7978d5168d1fb0da3bb95856846e1d9672902c5ee175c42a1f16d344586507a4fbe8c3d8b9b683c5e31c1ace9b941e4f