[rpm/f17] Fixed an issue with the ppc64p7 support where on 32bit ppc the detection would go horribly wrong

[Phil Knirsch]

commit ae517e7f5aa0a9df5208dea63f222468c4c508ef
Author: Phil Knirsch <pknirsch at redhat.com>
Date:   Wed Apr 25 16:17:15 2012 +0200

    Fixed an issue with the ppc64p7 support where on 32bit ppc the detection would go horribly wrong

 rpm-4.9.1.2-ppc64p7.patch |    2 +-
 rpm.spec                  |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/rpm-4.9.1.2-ppc64p7.patch b/rpm-4.9.1.2-ppc64p7.patch
index a21d8a4..104f30b 100644
--- a/rpm-4.9.1.2-ppc64p7.patch
+++ b/rpm-4.9.1.2-ppc64p7.patch
@@ -92,7 +92,7 @@ index 1b47dc3..0050091 100644
 +#	if defined(__linux__) && defined(__powerpc__)
 +	{
 +            int powerlvl;
-+            if (sscanf(rpmat.platform, "power%d", &powerlvl) == 1 && powerlvl > 6)
++            if (!rstreq(un.machine, "ppc") && sscanf(rpmat.platform, "power%d", &powerlvl) == 1 && powerlvl > 6)
 +                strcpy(un.machine, "ppc64p7");
 +        }
 +#	endif	/* ppc64*-linux */
diff --git a/rpm.spec b/rpm.spec
index b1111c9..b650894 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}.}3%{?dist}
+Release: %{?snapver:0.%{snapver}.}4%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@@ -476,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-4
+- Fixed an issue with the ppc64p7 support where on 32bit ppc the detection would go horribly wrong
+
 * Wed Apr 25 2012 Phil Knirsch <pknirsch at redhat.com> 4.9.1.3-3
 - Fixed missing ppc64p7 detection in installplatform