[libguestfs] Update patch to work with qemu from Rawhide.

[Richard W.M. Jones]

commit 5f60f6f0803dc3ea74cb735a3357fc0acbed13d0
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Aug 2 13:43:46 2011 +0100

    Update patch to work with qemu from Rawhide.

 0001-ocaml-Fix-locking-in-event-callbacks.patch    |   79 --------------------
 ...-1.12.0-configure-force-machine-accel-tcg.patch |    4 +-
 libguestfs.spec                                    |    4 +-
 3 files changed, 4 insertions(+), 83 deletions(-)
---
diff --git a/libguestfs-1.12.0-configure-force-machine-accel-tcg.patch b/libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
index a63ec6d..e9007cc 100644
--- a/libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
+++ b/libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
@@ -7,7 +7,7 @@ diff -ur libguestfs-1.12.0.old/configure libguestfs-1.12.0/configure
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for virtio-serial support in $QEMU" >&5
  $as_echo_n "checking for virtio-serial support in $QEMU... " >&6; }
 -    if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then
-+    if $QEMU -machine accel=tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
++    if $QEMU -machine pc,accel=tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
      else
@@ -19,7 +19,7 @@ diff -ur libguestfs-1.12.0.old/configure.ac libguestfs-1.12.0/configure.ac
  
      AC_MSG_CHECKING([for virtio-serial support in $QEMU])
 -    if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then
-+    if $QEMU -machine accel=tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
++    if $QEMU -machine pc,accel=tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
          AC_MSG_RESULT([yes])
      else
          AC_MSG_RESULT([no])
diff --git a/libguestfs.spec b/libguestfs.spec
index 97137aa..7f8239b 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.13.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -871,7 +871,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Aug  2 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.13.2-2
+* Tue Aug  2 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.13.2-3
 - Switch Rawhide to use the new development branch (1.13).
 - New upstream version 1.13.2.
 - Remove upstream patch.