[libguestfs/f16] - New upstream stable branch version 1.12.9. - Remove remaining two non-upstream patches. Upstream

[Richard W.M. Jones]

commit b1f9e5c8c47d1ec823b124863f1808b8f19d2764
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Oct 31 12:54:04 2011 +0000

    - New upstream stable branch version 1.12.9.
    - Remove remaining two non-upstream patches.  Upstream contains a full
      workaround for qemu -machine bugs.

 .gitignore                                         |    1 +
 ...chine-option-for-latest-qemu-thanks-Marku.patch |   74 --------------------
 ...-1.12.0-configure-force-machine-accel-tcg.patch |   25 -------
 libguestfs.spec                                    |   22 ++----
 sources                                            |    2 +-
 5 files changed, 8 insertions(+), 116 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de5e7f9..c614f5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,3 +94,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.12.6.tar.gz
 /libguestfs-1.12.7.tar.gz
 /libguestfs-1.12.8.tar.gz
+/libguestfs-1.12.9.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index 5bb067e..80dfee7 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -29,7 +29,7 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.12.8
+Version:       1.12.9
 Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
@@ -37,16 +37,6 @@ URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.12-stable/%{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%if 0%{?fedora} >= 16
-# Force qemu-kvm test to run with -machine accel=tcg flag.
-Patch0:        libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
-
-# Non-upstream patch to fix -machine option.  This is not upstream
-# because qemu look like they might revert (ie. fix) the -machine
-# option so that this patch would not be needed.
-Patch1:        0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
-%endif
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -501,11 +491,6 @@ for %{name}.
 %prep
 %setup -q
 
-%if 0%{?fedora} >= 16
-%patch0 -p1
-%patch1 -p1
-%endif
-
 mkdir -p daemon/m4
 
 # Replace developer-specific README that ships with libguestfs, with
@@ -867,6 +852,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 31 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.12.9-1
+- New upstream stable branch version 1.12.9.
+- Remove remaining two non-upstream patches.  Upstream contains a full
+  workaround for qemu -machine bugs.
+
 * Wed Oct 19 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.12.8-1
 - New upstream stable branch version 1.12.8.
 - Remove patch for skipping FUSE tests.  1.12.8 includes a backport
diff --git a/sources b/sources
index e42cac8..7c78dba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-676a1fd2d990e207def4ee6c53f37563  libguestfs-1.12.8.tar.gz
+bec3625a6ad88dab88e8d61e487e81b5  libguestfs-1.12.9.tar.gz