rpms
/
nbdkit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream development version 1.23.7. 

Add new NBDKit(3) man page for the OCaml plugin.
This commit is contained in:
Richard W.M. Jones 2020-10-05 21:39:44 +01:00
parent 504c4c027d
commit 2af579a406
3 changed files with 8 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
0001-tests-Tests-which-need-ext2.img-are-conditional-on-H.patch
View File

@ -1,52 +0,0 @@
From 093e37a13d8b9241ad1e9b093b5e56abbbf2872e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 22 Sep 2020 18:29:08 +0100
Subject: [PATCH] tests: Tests which need ext2.img are conditional on
HAVE_GUESTFISH.
When compiling on Fedora, on platforms which don't have a kernel like
i686 we don't have guestfish, so the tests fail with:
make[2]: guestfish: No such file or directory
Fixes: commit cecf51f50ba7d22ca8cbbb56543b95f716524fcb
---
tests/Makefile.am | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 390df711..b5b06810 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1389,6 +1389,13 @@ EXTRA_DIST += test-exportname.sh
# ext2 filter test.
if HAVE_MKE2FS_WITH_D
if HAVE_EXT2
+if HAVE_GUESTFISH
+
+LIBGUESTFS_TESTS += test-ext2
+
+test_ext2_SOURCES = test-ext2.c test.h
+test_ext2_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
+test_ext2_LDADD = libtest.la $(LIBGUESTFS_LIBS)
TESTS += test-ext2-exportname.sh
EXTRA_DIST += test-ext2-exportname.sh
@@ -1410,14 +1417,6 @@ ext2.img: disk test-ext2-exportname.sh
rm manifest
mv $@-t $@
-if HAVE_GUESTFISH
-
-LIBGUESTFS_TESTS += test-ext2
-
-test_ext2_SOURCES = test-ext2.c test.h
-test_ext2_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
-test_ext2_LDADD = libtest.la $(LIBGUESTFS_LIBS)
-
endif HAVE_GUESTFISH
endif HAVE_EXT2
endif HAVE_MKE2FS_WITH_D
--
2.27.0

10
nbdkit.spec
View File

@ -45,7 +45,7 @@ ExclusiveArch: x86_64
%global source_directory 1.23-development
Name: nbdkit
Version: 1.23.6
Version: 1.23.7
Release: 1%{?dist}
Summary: NBD server
@ -64,9 +64,6 @@ Source1: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name
Source2: libguestfs.keyring
%endif
# Upstream patch which fixes the tests on armv7.
Patch1: 0001-tests-Tests-which-need-ext2.img-are-conditional-on-H.patch
%if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool
%endif
@ -1005,6 +1002,7 @@ export LIBGUESTFS_TRACE=1
%{_libdir}/libnbdkitocaml.so
%{_libdir}/ocaml/NBDKit.*
%{_mandir}/man3/nbdkit-ocaml-plugin.3*
%{_mandir}/man3/NBDKit.3*
%endif
@ -1208,6 +1206,10 @@ export LIBGUESTFS_TRACE=1
%changelog
* Mon Oct 05 2020 Richard W.M. Jones <rjones@redhat.com> - 1.23.7-1
- New upstream development version 1.23.7.
- Add new NBDKit(3) man page for the OCaml plugin.
* Tue Sep 22 2020 Richard W.M. Jones <rjones@redhat.com> - 1.23.6-1
- New upstream development version 1.23.6.
- New exportname filter.

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (nbdkit-1.23.6.tar.gz) = bb1af217dfb155ae46f5ea4aaa44caccc58bf75559d53b5d202a4121867573e5811a63177cd98be0009fa7cd68958112f948de7b5fb4c11db31d5cad82d2b87b
SHA512 (nbdkit-1.23.6.tar.gz.sig) = f1230ff7532cb10b600fafefdeededc0de34fb5d5dafd53fbcefb47e380a48d5b5b56fe73ea619e726c404962b2b7689a322911fd19de9b5049ed4c923b8aafc
SHA512 (nbdkit-1.23.7.tar.gz) = 36db9c528e76fc801883bbdfbe1574c830c432c1d44596c5915f758e7dca0d6080ff6a60acf6c7a31a62caf85bbccb3fe3a9d4037ebe10767a40ffb9f82c9e34
SHA512 (nbdkit-1.23.7.tar.gz.sig) = 726b320e5539fbeb4468d936c188dc2096c579ffc09b2c0392b08eee6c5d89d6b92d4e22c8c7932cec8e30d01ddfa4a73b169a85e47d0d3cbacc10d493a9206f