diff --git a/0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch b/0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch deleted file mode 100644 index 71ecdc6..0000000 --- a/0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 183d81fa792fd024f62d068ead9cad0cc53d3c8e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 12 Mar 2019 22:13:24 +0000 -Subject: [PATCH] tests: Use a more robust method to create the test disk - atomically. - ---- - tests/Makefile.am | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 1712565..f50a35e 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -334,9 +334,10 @@ check_DATA += disk - CLEANFILES += disk - - disk: -- rm -f $@ test1.img -- guestfish -N fs:ext4:100M -m /dev/sda1 write /hello.txt "hello,world" -- mv test1.img disk -+ rm -f $@ $@-t -+ guestfish -N $@-t=fs:ext4:100M -m /dev/sda1 \ -+ write /hello.txt "hello,world" -+ mv $@-t $@ - - endif HAVE_GUESTFISH - --- -2.20.1 - diff --git a/nbdkit.spec b/nbdkit.spec index bf3f3df..da9ad63 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -20,14 +20,13 @@ %global verify_tarball_signature 1 # If there are patches which touch autotools files, set this to 1. -#%global patches_touch_autotools %{nil} -%global patches_touch_autotools 1 +%global patches_touch_autotools %{nil} # The source directory. %global source_directory 1.11-development Name: nbdkit -Version: 1.11.8 +Version: 1.11.9 Release: 1%{?dist} Summary: NBD server @@ -41,9 +40,6 @@ Source1: http://libguestfs.org/download/nbdkit/%{source_directory}/%{name Source2: libguestfs.keyring %endif -# Upstream patch for tests. -Patch1: 0001-tests-Use-a-more-robust-method-to-create-the-test-di.patch - %if 0%{patches_touch_autotools} BuildRequires: autoconf, automake, libtool %endif @@ -832,6 +828,9 @@ make %{?_smp_mflags} check || { %changelog +* Sat Mar 23 2019 Richard W.M. Jones - 1.11.9-1 +- New upstream version 1.11.9. + * Tue Mar 12 2019 Richard W.M. Jones - 1.11.8-1 - New upstream version 1.11.8.