From ec962e7d694831c8097ff12195df20f280ce29d4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 6 Apr 2014 17:04:13 +0100
Subject: [PATCH] New upstream version 5.1.7.

- Remove ppc64p7 patch which is now upstream.
---
 ...-is-an-architecture-variant-of-ppc64.patch | 26 -------------------
 sources                                       |  2 +-
 supermin.spec                                 | 13 +++++-----
 3 files changed, 7 insertions(+), 34 deletions(-)
 delete mode 100644 0001-utils-ppc64p7-is-an-architecture-variant-of-ppc64.patch

diff --git a/0001-utils-ppc64p7-is-an-architecture-variant-of-ppc64.patch b/0001-utils-ppc64p7-is-an-architecture-variant-of-ppc64.patch
deleted file mode 100644
index acb34c6..0000000
--- a/0001-utils-ppc64p7-is-an-architecture-variant-of-ppc64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0ffcc562763e8a653ac319ea96b2c09bed762de1 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 28 Mar 2014 16:35:58 +0100
-Subject: [PATCH] utils: ppc64p7 is an architecture variant of ppc64.
-
-POWER 7 with VSX and other extra instructions.
----
- src/utils.ml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/utils.ml b/src/utils.ml
-index 55f6754..2e63a3a 100644
---- a/src/utils.ml
-+++ b/src/utils.ml
-@@ -193,7 +193,7 @@ let compare_architecture a1 a2 =
-     | a when string_prefix "armv7" a -> 32
-     | a when string_prefix "armv8" a -> 64
-     | "ppc" | "ppc32" -> 32
--    | "ppc64" -> 64
-+    | a when string_prefix "ppc64" a -> 64
-     | "sparc" | "sparc32" -> 32
-     | "sparc64" -> 64
-     | "ia64" -> 64
--- 
-1.8.5.3
-
diff --git a/sources b/sources
index e42a555..cc0e67a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b83eed49c687c996d1e5c418ecb17e4f  supermin-5.1.6.tar.gz
+0692c5627f6ee5030cf24033fa6ad7f2  supermin-5.1.7.tar.gz
diff --git a/supermin.spec b/supermin.spec
index d591602..1bafcd1 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -1,7 +1,7 @@
 Summary:       Tool for creating supermin appliances
 Name:          supermin
-Version:       5.1.6
-Release:       5%{?dist}
+Version:       5.1.7
+Release:       1%{?dist}
 License:       GPLv2+
 
 %if 0%{?rhel} >= 7
@@ -11,9 +11,6 @@ ExclusiveArch: x86_64
 URL:           http://people.redhat.com/~rjones/supermin/
 Source0:       http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
 
-# Upstream patch to fix supermin on ppc64p7.
-Patch1:        0001-utils-ppc64p7-is-an-architecture-variant-of-ppc64.patch
-
 BuildRequires: /usr/bin/pod2man
 BuildRequires: rpm
 BuildRequires: yum-utils
@@ -55,8 +52,6 @@ second when you need to boot one of them.
 %prep
 %setup -q
 
-%patch1 -p1
-
 
 %build
 %configure --disable-network-tests
@@ -90,6 +85,10 @@ make check || {
 
 
 %changelog
+* Sun Apr  6 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.7-1
+- New upstream version 5.1.7.
+- Remove ppc64p7 patch which is now upstream.
+
 * Thu Apr  3 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.6-5
 - Requires tar, which is not installed in an @Core installation.