From dfcc0cd357b8d49b84cf69f13927276cbd276a74 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 29 2020 07:04:29 +0000
Subject: import nbdkit-1.8.0-4.el7


---

diff --git a/SPECS/nbdkit.spec b/SPECS/nbdkit.spec
index 91a4e5e..dacf8c6 100644
--- a/SPECS/nbdkit.spec
+++ b/SPECS/nbdkit.spec
@@ -27,7 +27,7 @@
 
 Name:           nbdkit
 Version:        1.8.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NBD server
 
 License:        BSD
@@ -244,13 +244,6 @@ sed -i -e '/^if HAVE_GUESTFISH/,/^endif HAVE_GUESTFISH/d' tests/Makefile.am
 automake
 %endif
 
-# Ancient qemu-io in RHEL 7 doesn't support -f FORMAT option.  However
-# we can just omit it and the tests still work fine.
-for f in tests/*.sh; do
-  sed -i -e 's/qemu-io -f raw/qemu-io/g' \
-         -e 's/qemu-io -r -f raw/qemu-io -r/g' $f
-done
-
 # Disable numerous tests which cannot work with ancient gnutls or
 # qemu-img on RHEL 7.
 for f in tests/test-cache.sh \
@@ -458,6 +451,10 @@ make check -j1 || {
 
 
 %changelog
+* Fri Apr  3 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-4
+- Remove workaround for ancient qemu-io
+  resolves: rhbz#1820275
+
 * Tue Oct  1 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-3
 - Fix for CVE-2019-14850 denial of service due to premature opening
   of back-end connection