[libguestfs/f16] New upstream stable branch version 1.12.8.

[Richard W.M. Jones]

commit 47d1c0951104a8128f9e78c743032255b29bd123
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Oct 19 19:41:35 2011 +0100

    New upstream stable branch version 1.12.8.
    
    - Remove patch for skipping FUSE tests.  1.12.8 includes a backport
      that does this automatically.
    - Renumber the two remaining non-upstream patches as patch0, patch1.
    - Rebase patch1.

 .gitignore                                         |    1 +
 ...chine-option-for-latest-qemu-thanks-Marku.patch |   14 ++++----
 libguestfs-1.7.13-no-fuse-test.patch               |   33 --------------------
 libguestfs.spec                                    |   23 ++++++++------
 sources                                            |    2 +-
 5 files changed, 22 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 61536e9..de5e7f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -93,3 +93,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.12.5.tar.gz
 /libguestfs-1.12.6.tar.gz
 /libguestfs-1.12.7.tar.gz
+/libguestfs-1.12.8.tar.gz
diff --git a/0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch b/0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
index f8e9141..7908c70 100644
--- a/0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
+++ b/0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
@@ -1,6 +1,6 @@
-diff -ur libguestfs-1.12.5.old/src/launch.c libguestfs-1.12.5/src/launch.c
---- libguestfs-1.12.5.old/src/launch.c	2011-08-28 09:19:27.000000000 +0100
-+++ libguestfs-1.12.5/src/launch.c	2011-08-28 11:04:27.349272807 +0100
+diff -ur libguestfs-1.12.8.old/src/launch.c libguestfs-1.12.8/src/launch.c
+--- libguestfs-1.12.8.old/src/launch.c	2011-10-19 18:34:13.000000000 +0100
++++ libguestfs-1.12.8/src/launch.c	2011-10-19 19:40:28.898547335 +0100
 @@ -76,10 +76,10 @@
  static void print_qemu_command_line (guestfs_h *g, char **argv);
  static int connect_unix_socket (guestfs_h *g, const char *sock);
@@ -29,9 +29,9 @@ diff -ur libguestfs-1.12.5.old/src/launch.c libguestfs-1.12.5/src/launch.c
  }
 -#endif
  
- /* Add a string to the current command line. */
+ /* Functions to add a string to the current command line. */
  static void
-@@ -517,14 +519,19 @@
+@@ -524,14 +526,19 @@
      if (qemu_supports (g, "-nodefconfig"))
        add_cmdline (g, "-nodefconfig");
  
@@ -56,7 +56,7 @@ diff -ur libguestfs-1.12.5.old/src/launch.c libguestfs-1.12.5/src/launch.c
        /* qemu sometimes needs this option to enable hardware
         * virtualization, but some versions of 'qemu-kvm' will use KVM
         * regardless (even where this option appears in the help text).
-@@ -1165,7 +1172,6 @@
+@@ -1173,7 +1180,6 @@
    return strstr (g->qemu_help, option) != NULL;
  }
  
@@ -64,7 +64,7 @@ diff -ur libguestfs-1.12.5.old/src/launch.c libguestfs-1.12.5/src/launch.c
  /* As above but using a regex instead of a fixed string. */
  static int
  qemu_supports_re (guestfs_h *g, const pcre *option_regex)
-@@ -1177,7 +1183,6 @@
+@@ -1185,7 +1191,6 @@
  
    return match (g, g->qemu_help, option_regex);
  }
diff --git a/libguestfs.spec b/libguestfs.spec
index fbc93d4..5bb067e 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -29,25 +29,22 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.12.7
-Release:       2%{?dist}.1
+Version:       1.12.8
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.12-stable/%{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 
-# Disable FUSE tests, not supported in Koji at the moment.
-Patch0:        libguestfs-1.7.13-no-fuse-test.patch
-
 %if 0%{?fedora} >= 16
 # Force qemu-kvm test to run with -machine accel=tcg flag.
-Patch2:        libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
+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.
-Patch3:        0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
+Patch1:        0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
 %endif
 
 # Basic build requirements:
@@ -504,10 +501,9 @@ for %{name}.
 %prep
 %setup -q
 
-%patch0 -p1
 %if 0%{?fedora} >= 16
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1
+%patch1 -p1
 %endif
 
 mkdir -p daemon/m4
@@ -871,6 +867,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
+  that does this automatically.
+- Renumber the two remaining non-upstream patches as patch0, patch1.
+- Rebase patch1.
+
 * Mon Oct 03 2011 Rex Dieter <rdieter at fedoraproject.org> - 1:1.12.7-2.1
 - rebuild (java), rel-eng#4932
 
diff --git a/sources b/sources
index 5c390aa..e42cac8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8099728e7516bbb9c7e3df96f3c7f30  libguestfs-1.12.7.tar.gz
+676a1fd2d990e207def4ee6c53f37563  libguestfs-1.12.8.tar.gz