From 68a1973bdce43aef37a8e606e80da61592cf1f56 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 11 Nov 2011 13:32:14 +0000
Subject: [PATCH] Add upstream patch to print output of virt-df when test
 fails.

---
 ...t-of-test-virt-df.sh-on-failure-path.patch | 23 +++++++++++++++++++
 libguestfs.spec                               | 10 +++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 0001-df-Print-output-of-test-virt-df.sh-on-failure-path.patch

diff --git a/0001-df-Print-output-of-test-virt-df.sh-on-failure-path.patch b/0001-df-Print-output-of-test-virt-df.sh-on-failure-path.patch
new file mode 100644
index 0000000..262a3d4
--- /dev/null
+++ b/0001-df-Print-output-of-test-virt-df.sh-on-failure-path.patch
@@ -0,0 +1,23 @@
+From 39dfb23749cbfd376dd2f2929fb57a999705bad0 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 11 Nov 2011 13:30:09 +0000
+Subject: [PATCH] df: Print output of test-virt-df.sh on failure path.
+
+---
+ df/test-virt-df.sh |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/df/test-virt-df.sh b/df/test-virt-df.sh
+index 6878327..e2123a6 100755
+--- a/df/test-virt-df.sh
++++ b/df/test-virt-df.sh
+@@ -68,5 +68,6 @@ if [ "$(echo "$output" | sort | awk '/VG.LV[123]/ { print $2 " " $3 " " $4 " " $
+ 31729 395 29696 2%
+ 63472 144 60052 1%" ]; then
+     echo "$0: error: output of virt-df did not match expected (df) output"
++    echo "$output"
+     exit 1
+ fi
+-- 
+1.7.6
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 7fb82de..01db452 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.15.3
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -232,6 +232,9 @@ Source3:       99-guestfsd.rules
 # Replacement README file for Fedora users.
 Source4:       README-replacement.in
 
+# Upstream patch to print output of virt-df when test fails.
+Patch0:        0001-df-Print-output-of-test-virt-df.sh-on-failure-path.patch
+
 
 %description
 Libguestfs is a library for accessing and modifying guest disk images.
@@ -582,6 +585,8 @@ for %{name}.
 %prep
 %setup -q
 
+%patch0 -p1
+
 mkdir -p daemon/m4
 
 # Replace developer-specific README that ships with libguestfs, with
@@ -957,6 +962,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 11 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.3-2
+- Add upstream patch to print output of virt-df when test fails.
+
 * Thu Nov 10 2011 Richard W.M. Jones <rjones@redhat.com> - 1:1.15.3-1
 - New upstream version 1.15.3.
 - Fix list of BuildRequires so they precisely match the appliance.