- leave osfmach3_ppc alone

[packages/rpm.git] / rpm-morearchs.patch

diff --git a/rpm-morearchs.patch b/rpm-morearchs.patch
index e7847e53df02900612e357e4e0572742d6cef976..b2cc02c05bfa09d4b7aa7b6aa99d4b7265644bc9 100644 (file)
--- a/rpm-morearchs.patch
+++ b/rpm-morearchs.patch
@@ -22,23 +22,28 @@ diff -ur rpm-4.4.4/installplatform rpm-4.4.4.morearchs/installplatform
    s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;;
    *) SUBSTS=y___ ;;
  esac
-diff -ur rpm-4.4.4/lib/rpmrc.c rpm-4.4.4.morearchs/lib/rpmrc.c
---- rpm-4.4.4/lib/rpmrc.c      2006-02-11 15:01:38.000000000 +0000
-+++ rpm-4.4.4.morearchs/lib/rpmrc.c    2006-02-11 18:00:45.000000000 +0000
-@@ -1328,7 +1328,12 @@
- 
-           if ( pvr ) {
-               pvr >>= 16;
--              if ( pvr >= 0x40)
-+              if ( (pvr & ~0x3) == 0x8000)
-+                  // 0x8000: 7450, 0x8001: 7455, 0x8002: 7457, 0x8003: 7447A
+--- rpm-4.4.5/lib/rpmrc.c.orig 2006-02-28 22:01:56.462419250 +0100
++++ rpm-4.4.5/lib/rpmrc.c      2006-02-28 22:09:36.415164500 +0100
+@@ -1331,10 +1331,18 @@
+               switch (pvr) {
+               /* IBM750FX, 7410, 7450,  7451, 7441, 7455, 7445 */ 
+               case 0x7000:
++                  strcpy(un.machine, "ppc"); 
++                  break;
+               case 0x8000:
+               case 0x8001:
++              case 0x8002:
++              case 0x8003:
++                  /* 0x8000: 7450, 0x8001: 7455, 0x8002: 7457, 0x8003: 7447A */
 +                  strcpy(un.machine, "ppc7450");
-+              else if ( pvr == 0x800C || pvr == 12 )
-+                  strcpy(un.machine, "ppc7400\n");
-+              else if ( pvr >= 0x40)
-                   strcpy(un.machine, "ppcpseries");
-               else if ( (pvr == 0x36) || (pvr == 0x37) )
-                   strcpy(un.machine, "ppciseries");
++                  break;
+               case 0x800c:
+-                  strcpy(un.machine, "ppc"); 
++              case 0x000c:
++                  strcpy(un.machine, "ppc7400");
+                   break;
+               case 0x36:
+               case 0x37:
 diff -ur rpm-4.4.4/macros.in rpm-4.4.4.morearchs/macros.in
 --- rpm-4.4.4/macros.in        2006-02-11 15:01:38.000000000 +0000
 +++ rpm-4.4.4.morearchs/macros.in      2006-02-11 18:17:36.000000000 +0000
@@ -71,17 +76,16 @@ diff -ur rpm-4.4.4/rpmrc.in rpm-4.4.4.morearchs/rpmrc.in
  arch_canon:   ppc8260:        ppc8260 5
  arch_canon:   ppc8560:        ppc8560 5
  arch_canon:   ppc32dy4:       ppc32dy4        5
-@@ -212,7 +216,8 @@
- buildarchtranslate: sun4u: sparc64
+@@ -213,6 +217,8 @@
  buildarchtranslate: sparc64: sparc64
  
--buildarchtranslate: osfmach3_ppc: ppc
+ buildarchtranslate: osfmach3_ppc: ppc
 +buildarchtranslate: ppc7400: ppc7400
 +buildarchtranslate: ppc7450: ppc7450
  buildarchtranslate: powerpc: ppc
  buildarchtranslate: powerppc: ppc
  buildarchtranslate: ppc8260: ppc
-@@ -263,6 +268,8 @@
+@@ -263,6 +269,8 @@
  arch_compat: osfmach3_i486: i486 osfmach3_i386
  arch_compat: osfmach3_i386: i486
  
@@ -90,7 +94,7 @@ diff -ur rpm-4.4.4/rpmrc.in rpm-4.4.4.morearchs/rpmrc.in
  arch_compat: osfmach3_ppc: ppc
  arch_compat: powerpc: ppc
  arch_compat: powerppc: ppc
-@@ -375,6 +382,8 @@
+@@ -375,6 +383,8 @@
  
  buildarch_compat: m68k: noarch