- fix platform detection for ppc vs ppc64 (failed on ppc64 with

personality changed to ppc)

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=230

powerpc-fix-platform.diff

@@ -0,0 +1,11 @@
+--- lib/rpmrc.c	2012/10/16 16:37:34	1.1
++++ lib/rpmrc.c	2012/10/16 16:38:10
+@@ -1091,7 +1091,7 @@
+ #	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 */

rpm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 16 18:39:11 CEST 2012 - ro@suse.de
+
+- fix platform detection for ppc vs ppc64 (failed on ppc64 with
+  personality changed to ppc) 
+
 -------------------------------------------------------------------
 Wed Oct 10 07:03:41 UTC 2012 - adrian@suse.de
 

rpm.spec

@@ -135,6 +135,7 @@ Patch79:        helperenv.diff
 Patch80:        obsoletesdeptag.diff
 Patch81:        fdopen_strncat.diff
 Patch82:        fix-fd-leak.diff
+Patch83:        powerpc-fix-platform.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
 # avoid bootstrapping problem
@@ -211,7 +212,7 @@ rm -f rpmdb/db.h
 %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59
 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
-%patch -P 80 -P 81 -P 82
+%patch -P 80 -P 81 -P 82 -P 83
 #chmod 755 scripts/find-supplements{,.ksyms}
 #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms
 #chmod 755 scripts/firmware.prov