From 7ccd2f28ed14e7e00908b33a10b04c2cb61e12e5 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Dec 02 2014 10:00:46 +0000
Subject: Add upstream patch to fix ./configure qemu detection on powerpc64le.


---

diff --git a/0001-build-Map-host-CPU-powerpc64le-to-qemu-system-ppc64.patch b/0001-build-Map-host-CPU-powerpc64le-to-qemu-system-ppc64.patch
new file mode 100644
index 0000000..ff62865
--- /dev/null
+++ b/0001-build-Map-host-CPU-powerpc64le-to-qemu-system-ppc64.patch
@@ -0,0 +1,45 @@
+From de0b7c4e66ca97b97cebd842226eacd66a0633a4 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 2 Dec 2014 09:50:02 +0000
+Subject: [PATCH] build: Map host CPU 'powerpc64le' to qemu-system-ppc64.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Make the corresponding change in libguestfs-test-tool as well.
+
+Thanks: Dan Horák
+---
+ configure.ac          | 2 +-
+ test-tool/test-tool.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0b34ae3..80115f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -760,7 +760,7 @@ AS_CASE([$host_cpu],
+         [i@<:@456@:>@86],[qemu_cpu=i386],
+         [arm*],[qemu_cpu=arm],
+         [amd64],[qemu_cpu=x86_64],
+-        [powerpc64 | ppc64le],[qemu_cpu=ppc64],
++        [powerpc64 | ppc64le | powerpc64le],[qemu_cpu=ppc64],
+         [qemu_cpu=$host_cpu])
+ default_qemu="qemu-kvm kvm qemu-system-$qemu_cpu qemu"
+ AC_ARG_WITH([qemu],
+diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
+index f3eb59d..4db39a3 100644
+--- a/test-tool/test-tool.c
++++ b/test-tool/test-tool.c
+@@ -394,7 +394,7 @@ set_qemu (guestfs_h *g, const char *path, int use_wrapper)
+            "          ;;\n"
+            "    arm*) qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-arm\"\n"
+            "          ;;\n"
+-           "    powerpc64|ppc64le)\n"
++           "    powerpc64|ppc64le|powerpc64le)\n"
+            "          qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-ppc64\"\n"
+            "          ;;\n"
+            "    *)    qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-$host_cpu\"\n"
+-- 
+2.1.0
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 63ea922..c57e2d3 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -25,13 +25,17 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.28.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 
 # Source and patches.
 URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.28-stable/%{name}-%{version}.tar.gz
 
+# Upstream patch to fix ./configure qemu detection on powerpc64le:
+Patch1:        0001-build-Map-host-CPU-powerpc64le-to-qemu-system-ppc64.patch
+BuildRequires: autoconf, automake, libtool
+
 # Basic build requirements:
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -728,6 +732,9 @@ for %{name}.
 %prep
 %setup -q
 
+%patch1 -p1
+autoconf
+
 if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
     # For sVirt to work, the local temporary directory we use in the
     # tests must be labelled the same way as /tmp.
@@ -1225,6 +1232,9 @@ popd
 
 
 %changelog
+* Tue Dec  2 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.28.4-2
+- Add upstream patch to fix ./configure qemu detection on powerpc64le.
+
 * Sun Nov 30 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.28.4-1
 - New upstream version 1.28.4.