diff --git a/0001-configure-Map-powerpc64-ppc64.patch b/0001-configure-Map-powerpc64-ppc64.patch deleted file mode 100644 index 40c8ae7..0000000 --- a/0001-configure-Map-powerpc64-ppc64.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a550ecb5f198ff7179df097ffc7847ff576115ee Mon Sep 17 00:00:00 2001 -From: David Sommerseth -Date: Thu, 6 Nov 2014 15:14:04 +0000 -Subject: [PATCH] configure: Map powerpc64 -> ppc64. - ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 8916ebd..fd12431 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -760,6 +760,7 @@ qemu_system="$( - $SED -e 's/-i@<:@456@:>@86/-i386/g' \ - -e 's/-arm.*/-arm/g' \ - -e 's/-amd64/-x86_64/g' \ -+ -e 's/-powerpc64/-ppc64/g' \ - -e 's/-ppc64le/-ppc64/g' - )" - default_qemu="qemu-kvm kvm $qemu_system qemu" --- -2.1.0 - diff --git a/libguestfs.spec b/libguestfs.spec index 19d55be..fc2a9ba 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -32,9 +32,6 @@ License: LGPLv2+ URL: http://libguestfs.org/ Source0: http://libguestfs.org/download/1.29-development/%{name}-%{version}.tar.gz -# Another fix for ppc64/ppc64le. -Patch1: 0001-configure-Map-powerpc64-ppc64.patch - # Basic build requirements: BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Man) @@ -731,8 +728,6 @@ for %{name}. %prep %setup -q -%patch1 -p1 - 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. @@ -1232,6 +1227,7 @@ popd %changelog * Fri Nov 07 2014 Richard W.M. Jones - 1:1.29.6-1 - New upstream version 1.29.6. +- Remove patch which is now upstream. * Wed Nov 05 2014 Richard W.M. Jones - 1:1.29.5-1 - New upstream version 1.29.5.