diff --git a/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch b/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch index 67d662d..672384d 100644 --- a/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch +++ b/0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch @@ -1,23 +1,25 @@ -From 07ecff1613b73f32b5954bd3a3d46bef6a39e396 Mon Sep 17 00:00:00 2001 +From 9dc5dba35b3af9eaa98f97d8eb83a39435574230 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 9 Jun 2018 14:56:13 +0100 -Subject: [PATCH] =?UTF-8?q?tests:=20If=20guestfish=20isn't=20available,=20?= - =?UTF-8?q?=E2=80=98disk=E2=80=99=20is=20not=20created=20so=20disable=20te?= - =?UTF-8?q?sts=20which=20need=20it.?= +Subject: [PATCH 1/4] =?UTF-8?q?tests:=20If=20guestfish=20isn't=20available?= + =?UTF-8?q?,=20=E2=80=98disk=E2=80=99=20is=20not=20created=20so=20disable?= + =?UTF-8?q?=20tests=20which=20need=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes commit 02f27adc50ed5b83021df4edc84f4dbf8b03a0e3. + +(cherry picked from commit 07ecff1613b73f32b5954bd3a3d46bef6a39e396) --- tests/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 850240b..64a758e 100644 +index ff51120..53b2d8a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -279,6 +279,7 @@ test_file_LDADD = libtest.la $(LIBGUESTFS_LIBS) +@@ -251,6 +251,7 @@ test_file_LDADD = libtest.la $(LIBGUESTFS_LIBS) # gzip plugin test. if HAVE_ZLIB @@ -25,7 +27,7 @@ index 850240b..64a758e 100644 LIBGUESTFS_TESTS += test-gzip check_DATA += disk.gz -@@ -292,6 +293,7 @@ disk.gz: disk +@@ -264,6 +265,7 @@ disk.gz: disk rm -f $@ gzip -9 -c disk > $@ @@ -33,7 +35,7 @@ index 850240b..64a758e 100644 endif HAVE_ZLIB # memory plugin test. -@@ -347,6 +349,7 @@ test_streaming_LDADD = libtest.la $(LIBGUESTFS_LIBS) +@@ -319,6 +321,7 @@ test_streaming_LDADD = libtest.la $(LIBGUESTFS_LIBS) # xz plugin test. if HAVE_LIBLZMA @@ -41,7 +43,7 @@ index 850240b..64a758e 100644 LIBGUESTFS_TESTS += test-xz check_DATA += disk.xz -@@ -360,6 +363,7 @@ disk.xz: disk +@@ -332,6 +335,7 @@ disk.xz: disk rm -f $@ xz --best --block-size=16777216 -c disk > $@ diff --git a/0002-docs-Fix-separators-in-list-of-plugins.patch b/0002-docs-Fix-separators-in-list-of-plugins.patch new file mode 100644 index 0000000..1618ed9 --- /dev/null +++ b/0002-docs-Fix-separators-in-list-of-plugins.patch @@ -0,0 +1,32 @@ +From 69b77654bd1244c187c5cbdecc362be1d4f587a5 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 9 Jun 2018 18:29:43 +0100 +Subject: [PATCH 2/4] docs: Fix separators in list of plugins (. -> ,) + +(cherry picked from commit 4c4ebb955e9504503f2b950344529fa1a4222715) +--- + docs/nbdkit.pod | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/docs/nbdkit.pod b/docs/nbdkit.pod +index 1a0c005..2802b73 100644 +--- a/docs/nbdkit.pod ++++ b/docs/nbdkit.pod +@@ -925,10 +925,10 @@ L, + L, + L, + L, +-L. +-L. +-L. +-L. ++L, ++L, ++L, ++L, + L. + + Filters: +-- +2.16.2 + diff --git a/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch b/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch new file mode 100644 index 0000000..d7645ce --- /dev/null +++ b/0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch @@ -0,0 +1,49 @@ +From 5558eb0633a48325970baa647b9e8f4ac9eb4520 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 10 Jun 2018 20:33:12 +0100 +Subject: [PATCH 3/4] docs: Suggest using PKG_CHECK_VAR to substitute plugindir + and filterdir. + +(cherry picked from commit fcd05424c819e433543030373a7f4136b511ddc6) +--- + docs/nbdkit-filter.pod | 6 ++++++ + docs/nbdkit-plugin.pod | 6 ++++++ + 2 files changed, 12 insertions(+) + +diff --git a/docs/nbdkit-filter.pod b/docs/nbdkit-filter.pod +index 7105a1d..2e23a8e 100644 +--- a/docs/nbdkit-filter.pod ++++ b/docs/nbdkit-filter.pod +@@ -463,6 +463,12 @@ You can also run pkg-config/pkgconf directly, for example: + exit 1 + fi + ++You can also substitute the filterdir variable by doing: ++ ++ PKG_CHECK_VAR([NBDKIT_FILTERDIR], [nbdkit], [filterdir]) ++ ++which defines C<$(NBDKIT_FILTERDIR)> in automake-generated Makefiles. ++ + =head1 SEE ALSO + + L, +diff --git a/docs/nbdkit-plugin.pod b/docs/nbdkit-plugin.pod +index 695e588..a393be9 100644 +--- a/docs/nbdkit-plugin.pod ++++ b/docs/nbdkit-plugin.pod +@@ -668,6 +668,12 @@ You can also run pkg-config/pkgconf directly, for example: + exit 1 + fi + ++You can also substitute the plugindir variable by doing: ++ ++ PKG_CHECK_VAR([NBDKIT_PLUGINDIR], [nbdkit], [plugindir]) ++ ++which defines C<$(NBDKIT_PLUGINDIR)> in automake-generated Makefiles. ++ + =head1 WRITING PLUGINS IN OTHER PROGRAMMING LANGUAGES + + You can also write nbdkit plugins in OCaml, Perl, Python or Ruby. +-- +2.16.2 + diff --git a/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch b/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch new file mode 100644 index 0000000..3f18f86 --- /dev/null +++ b/0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch @@ -0,0 +1,57 @@ +From e25e1bf830cc0252ef3374a3a1d391142726cf75 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 11 Jun 2018 11:48:08 +0100 +Subject: [PATCH 4/4] perl: Make example4 and tar plugins conditional on + --enable-perl. + +If you configured with --disable-perl then these plugins are still +built and installed. However they cannot work without the Perl +plugin, thus it is right to disable them. + +(cherry picked from commit a6aa7d50afa7a6a41865e9814428d3c1b8295167) +--- + plugins/example4/Makefile.am | 4 ++++ + plugins/tar/Makefile.am | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/plugins/example4/Makefile.am b/plugins/example4/Makefile.am +index abbda92..374b483 100644 +--- a/plugins/example4/Makefile.am ++++ b/plugins/example4/Makefile.am +@@ -39,6 +39,8 @@ CLEANFILES = *~ + + plugindir = $(libdir)/nbdkit/plugins + ++if HAVE_PERL ++ + plugin_SCRIPTS = nbdkit-example4-plugin + + # We have to do the rewriting here to avoid stupid exec_prefix. +@@ -59,3 +61,5 @@ nbdkit-example4-plugin.1: $(source) + mv $@.t $@ + + endif ++ ++endif +diff --git a/plugins/tar/Makefile.am b/plugins/tar/Makefile.am +index 57d1026..016ffef 100644 +--- a/plugins/tar/Makefile.am ++++ b/plugins/tar/Makefile.am +@@ -39,6 +39,8 @@ CLEANFILES = *~ + + plugindir = $(libdir)/nbdkit/plugins + ++if HAVE_PERL ++ + plugin_SCRIPTS = nbdkit-tar-plugin + + # We have to do the rewriting here to avoid stupid exec_prefix. +@@ -59,3 +61,5 @@ nbdkit-tar-plugin.1: $(source) + mv $@.t $@ + + endif ++ ++endif +-- +2.16.2 + diff --git a/nbdkit.spec b/nbdkit.spec index d9e1f2f..e3b7b5b 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -37,7 +37,10 @@ Source2: libguestfs.keyring # Upstream patch to fix tests. Touches tests/Makefile.am so we # need autotools temporarily. Patch1: 0001-tests-If-guestfish-isn-t-available-disk-is-not-creat.patch -BuildRequires: autoconf, automake, libtool +Patch2: 0002-docs-Fix-separators-in-list-of-plugins.patch +Patch3: 0003-docs-Suggest-using-PKG_CHECK_VAR-to-substitute-plugi.patch +Patch4: 0004-perl-Make-example4-and-tar-plugins-conditional-on-en.patch +BuildRequires: autoconf, automake, libtool %if 0%{?rhel} == 7 # On RHEL 7, nothing in the virt stack is shipped on aarch64 and @@ -640,6 +643,9 @@ popd %changelog +* Tue Jun 12 2018 Richard W.M. Jones - 1.2.4-2 +- Add all upstream patches since 1.2.4 was released. + * Sat Jun 9 2018 Richard W.M. Jones - 1.2.4-1 - New stable version 1.2.4. - Remove upstream patches.