rpms
/
nbdkit
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New upstream development version 1.17.2. 

Enable armv7 again.
This commit is contained in:
Richard W.M. Jones 2019-12-03 13:21:12 +00:00
parent a17a7db49e
commit 7f89f649c0
3 changed files with 7 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-tests-Run-just-built-nbdkit-not-installed-nbdkit.patch
View File

@ -1,26 +0,0 @@
From dcf767f55bcaf52fc7079b653749cccfe493b443 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 1 Dec 2019 20:13:30 +0000
Subject: [PATCH] tests: Run just built nbdkit, not installed nbdkit.
Fixes commit 7adcf1bd47c678c1f3489c02f138b32c99657a24.
---
tests/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 878ff59..f6508a6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -443,7 +443,7 @@ disk:
rm -rf disk.tmp $@ $@-t
mkdir disk.tmp
echo -n "hello,world" > disk.tmp/hello.txt
- nbdkit -fv -U - linuxdisk disk.tmp size=100M \
+ $(top_builddir)/nbdkit -fv -U - linuxdisk disk.tmp size=100M \
--run 'qemu-img convert $$nbd $@-t'
rm -rf disk.tmp
mv $@-t $@
--
2.23.0

12
nbdkit.spec
View File

@ -35,14 +35,14 @@ ExclusiveArch: x86_64
%global verify_tarball_signature 1
# If there are patches which touch autotools files, set this to 1.
%global patches_touch_autotools 1
%global patches_touch_autotools %{nil}
# The source directory.
%global source_directory 1.17-development
Name: nbdkit
Version: 1.17.1
Release: 2%{?dist}
Version: 1.17.2
Release: 1%{?dist}
Summary: NBD server
License: BSD
@ -55,9 +55,6 @@ Source1: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name
Source2: libguestfs.keyring
%endif
# Upstream patch which fixes the tests.
Patch1: 0001-tests-Run-just-built-nbdkit-not-installed-nbdkit.patch
%if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool
%endif
@ -917,7 +914,8 @@ make %{?_smp_mflags} check || {
%changelog
* Tue Dec 3 2019 Richard W.M. Jones <rjones@redhat.com> - 1.17.1-2
* Tue Dec 3 2019 Richard W.M. Jones <rjones@redhat.com> - 1.17.2-1
- New upstream development version 1.17.2.
- Enable armv7 again.
* Sun Dec 1 2019 Richard W.M. Jones <rjones@redhat.com> - 1.17.1-1

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (nbdkit-1.17.1.tar.gz) = 58cc49eb638157a07553a8bbb7c6675dc0f123752797f5535a2e7a63d905d576b0328d06cf80d0631d442648846388b343c01359cae821f932ca4f7b3a5ea92c
SHA512 (nbdkit-1.17.1.tar.gz.sig) = e925ac21cd182b0812b7be89ba3c7db0eafa177c84cd988c0ebb9b13377326895153071c6ffe5192538de9fe2c61ec6fe039b8fc80eb58e5a9f2e0156adc6668
SHA512 (nbdkit-1.17.2.tar.gz) = b1294a7658ce1d8d5c2bde631efabd2c9d9a1b4e934a3dfa507a20ecf08d195a5afb04a1f05d2eda4e0f4917f18d3b8885a69f9139a100ad96ad4924ed236e51
SHA512 (nbdkit-1.17.2.tar.gz.sig) = e7474d5371289379140f4ffd18f7c9e23b0f4216ea5ea7c351b47ce9a91cb95cbffc80eadffb63bd6aeed3802e1cf2ea36f8650abc230a09bd5e8726b5f68858