[rpm/f17] - Fixed missing ppc64p7 detection in installplatform

[Phil Knirsch]

commit f0f66bfa5e4a880d4aaad37ba6979b9163cb189d
Author: Phil Knirsch <pknirsch at redhat.com>
Date:   Wed Apr 25 14:32:58 2012 +0200

    - Fixed missing ppc64p7 detection in installplatform

 rpm-4.9.1.3-ppc64p7-platform.patch |   12 ++++++++++++
 rpm.spec                           |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/rpm-4.9.1.3-ppc64p7-platform.patch b/rpm-4.9.1.3-ppc64p7-platform.patch
new file mode 100644
index 0000000..de303ba
--- /dev/null
+++ b/rpm-4.9.1.3-ppc64p7-platform.patch
@@ -0,0 +1,12 @@
+diff -up rpm-4.9.1.3/installplatform.ppc64p7-platform rpm-4.9.1.3/installplatform
+--- rpm-4.9.1.3/installplatform.ppc64p7-platform	2012-04-25 14:13:45.000000000 +0200
++++ rpm-4.9.1.3/installplatform	2012-04-25 14:24:53.401513816 +0200
+@@ -22,7 +22,7 @@ case "$arch" in
+   arm*) SUBSTS='s_arm_arm_ s_arm_armv3l_ s_arm_armv4l_ s_arm_armv4tl_ s_arm_armv5tel_ s_arm_armv5tejl_ s_arm_armv6l_ s_arm_armv7l_ s_arm_armv7hl_ s_arm_armv7hnl_' ;;
+   sh4*) SUBSTS='s_sh4_sh4_ s_sh4_sh4a_' ;;
+   sparc*) SUBSTS='s_sparc\(64\|64v\|v9v\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
+-  powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;;
++  powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_ s_ppc\([^6ip]\|$\)_ppc64p7_' ;;
+   s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;;
+   x86_64|amd64|ia32e) SUBSTS='s,x86_64,x86_64, s,x86_64,ia32e, s,x86_64,amd64, s,x86_64,i386, s,x86_64,i486, s,x86_64,i586, s,x86_64,i686, s,x86_64,pentium3, s,x86_64,pentium4, s,x86_64,athlon, s,x86_64,geode,' ;;
+   *) SUBSTS=y___ ;;
diff --git a/rpm.spec b/rpm.spec
index 1ce9726..b1111c9 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}2%{?dist}
+Release: %{?snapver:0.%{snapver}.}3%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@@ -41,6 +41,9 @@ Patch4: rpm-4.8.1-use-gpg2.patch
 Patch5: rpm-4.9.0-armhfp.patch
 #conditionally applied patch for arm hardware floating point
 Patch6: rpm-4.9.0-armhfp-logic.patch
+# Fix installplatform for ppc64p7
+Patch7: rpm-4.9.1.3-ppc64p7-platform.patch
+
 
 # Patches already in upstream
 Patch100: rpm-4.9.x-fontattr.patch
@@ -259,6 +262,8 @@ packages on a system.
 %patch6 -p1 -b .armhfp-logic
 %endif
 
+%patch7 -p1 -b .ppc64p7-platform
+
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
 %endif
@@ -471,6 +476,9 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Wed Apr 25 2012 Phil Knirsch <pknirsch at redhat.com> 4.9.1.3-3
+- Fixed missing ppc64p7 detection in installplatform
+
 * Wed Apr 18 2012 Phil Knirsch <pknirsch at redhat.com> 4.9.1.3-2
 - Added upstream patch for general /proc/self/auxv parsing and ppc64p7 support