[libguestfs] Revert "New upstream version 1.19.53." Revert "Remove upstream patch."

[Richard W.M. Jones]

commit 64fdf78aa01d67e6483da5c8eacf0d7239467281
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Oct 24 12:20:24 2012 +0100

    Revert "New upstream version 1.19.53."
    Revert "Remove upstream patch."
    
    This reverts commit 6d7a3297e632bb643cbf703543d2a4de923151e6
    and commit f4f4d4edede7fdcc8f4fe3eed63ab55b8390c0cb.
    
    (both added accidentally by a script)

 ...st-events.sh-because-of-new-debug-message.patch |   28 ++++++++++++++++++++
 libguestfs.spec                                    |    9 +++---
 2 files changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/0001-fish-Fix-test-events.sh-because-of-new-debug-message.patch b/0001-fish-Fix-test-events.sh-because-of-new-debug-message.patch
new file mode 100644
index 0000000..f5dd449
--- /dev/null
+++ b/0001-fish-Fix-test-events.sh-because-of-new-debug-message.patch
@@ -0,0 +1,28 @@
+From 91c07d2a06fd4ec33db8d7737bfd73f61aa645fc Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones at redhat.com>
+Date: Wed, 24 Oct 2012 11:14:56 +0100
+Subject: [PATCH] fish: Fix test-events.sh because of new debug message.
+
+Commit 2e90f4312928f332f8997b52be3fe54f20920242 added a debug message
+which isn't filtered out by the set of grep -v's in this test.
+Therefore this test would fail when run with LIBGUESTFS_DEBUG=1.
+---
+ fish/test-events.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fish/test-events.sh b/fish/test-events.sh
+index b3684a8..79957ed 100755
+--- a/fish/test-events.sh
++++ b/fish/test-events.sh
+@@ -22,7 +22,7 @@ set -e
+ 
+ rm -f test.out
+ 
+-./guestfish -a /dev/null <<'EOF' | grep -v get_verbose | grep -v get_trace | grep -v 'library .*0x' > test.out
++./guestfish -a /dev/null <<'EOF' | grep -v get_verbose | grep -v get_trace | grep -v 'library .*0x' | grep -v 'library command' > test.out
+ trace true
+ 
+ event ev1 * "echo $EVENT $@"
+-- 
+1.7.11.4
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 265db30..4f45d5c 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,7 +22,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.19.53
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -43,6 +43,9 @@ Patch2:        libguestfs-1.19.2-remove-udev-from-packagelist.patch
 # on i386 only.  This works around a bug in 32-bit qemu (RHBZ#857026).
 Patch3:        0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch
 
+# Upstream patch to fix guestfish tests.
+Patch4:        0001-fish-Fix-test-events.sh-because-of-new-debug-message.patch
+
 %if 0%{?rhel} >= 7
 ExclusiveArch: x86_64
 %endif
@@ -695,6 +698,7 @@ autoreconf -i
 %endif
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 mkdir -p daemon/m4
 
@@ -1020,9 +1024,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
-* Wed Oct 24 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.53-1
-- New upstream version 1.19.53.
-
 * Wed Oct 24 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.53-2
 - Add upstream patch to fix guestfish tests.