- rename pmac to ppcmac.

- ia64: revert -O0 compilation.
- upgrade to db-3.3.11 final.

CVS patchset: 4984
CVS date: 2001/07/24 02:52:52

diff --git a/CHANGES b/CHANGES
index 509f663..cf83f6d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -189,6 +189,9 @@
        - add pmac/ppciseries/ppcpseries varieties to ppc arch family.
        - include tdigest.c tkey.c and trpmio.c to "make dist".
        - re-enable dependency resolution source from package NVR.
+       - rename pmac to ppcmac.
+       - ia64: revert -O0 compilation.
+       - upgrade to db-3.3.11 final.
 
 4.0 -> 4.0.[12]
        - add doxygen and lclint annotations most everywhere.

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index fc200f2..4717a31 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -1203,7 +1203,7 @@ static void defaultMachine(/*@out@*/ const char ** arch,
 
 #      if defined(__linux__) && defined(__powerpc__)
        {
-           uint32 pvr;
+           unsigned pvr;
            __asm__ __volatile__ ("mfspr %0, 287" : "=r" (pvr));
 
            pvr >>= 16;
@@ -1212,7 +1212,7 @@ static void defaultMachine(/*@out@*/ const char ** arch,
            else if ( (pvr == 0x36) || (pvr == 0x37) )
                strcpy(un.machine, "ppciseries");
            else
-               strcpy(un.machine, "pmac");
+               strcpy(un.machine, "ppcmac");
        }
 #      endif
 

diff --git a/rpmdb/db3.c b/rpmdb/db3.c
index 3e62926..9dcb658 100644 (file)
--- a/rpmdb/db3.c
+++ b/rpmdb/db3.c
@@ -556,8 +556,16 @@ static int db3byteswapped(dbiIndex dbi)    /*@*/
     DB * db = dbi->dbi_db;
     int rc = 0;
 
-    if (db != NULL)
+    if (db != NULL) {
+#if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR == 3 && DB_VERSION_PATCH == 11
+       int isswapped;
+       rc = db->get_byteswapped(db, &isswapped);
+       if (rc == 0)
+           rc = isswapped;
+#else
        rc = db->get_byteswapped(db);
+#endif
+    }
 
     return rc;
 }
@@ -997,8 +1005,16 @@ static int db3open(/*@keep@*/ rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
                rc = db->open(db, dbpath, dbsubfile,
                    dbi->dbi_type, oflags, dbi->dbi_perms);
 
-               if (rc == 0 && dbi->dbi_type == DB_UNKNOWN)
+               if (rc == 0 && dbi->dbi_type == DB_UNKNOWN) {
+#if DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR == 3 && DB_VERSION_PATCH == 11
+                   DBTYPE dbi_type;
+                   xx = db->get_type(db, &dbi_type);
+                   if (xx == 0)
+                       dbi->dbi_type = dbi_type;
+#else
                    dbi->dbi_type = db->get_type(db);
+#endif
+               }
            }
 
            /* XXX return rc == errno without printing */

diff --git a/rpmrc.in b/rpmrc.in
index 92b0983..f95737d 100644 (file)
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,7 +1,7 @@
 #/*! \page config_rpmrc Default configuration: /usr/lib/rpm/rpmrc
 # \verbatim
 #
-# $Id: rpmrc.in,v 2.41 2001/07/23 16:02:27 jbj Exp $
+# $Id: rpmrc.in,v 2.42 2001/07/24 02:52:52 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -37,7 +37,7 @@ optflags: m68k -O2 -fomit-frame-pointer
 optflags: ppc -O2 -fsigned-char
 optflags: ppciseries -O2 -fsigned-char
 optflags: ppcpseries -O2 -fsigned-char
-optflags: pmac -O2 -fsigned-char
+optflags: ppcmac -O2 -fsigned-char
 
 optflags: parisc -O2 -mpa-risc-1-0
 optflags: hppa1.0 -O2 -mpa-risc-1-0
@@ -91,7 +91,7 @@ arch_canon:   mipseb: mipseb  4
 arch_canon:    ppc:    ppc     5
 arch_canon:    ppciseries:     ppciseries      5
 arch_canon:    ppcpseries:     ppcpseries      5
-arch_canon:    pmac:   pmac    5
+arch_canon:    ppcmac: ppcmac  5
 
 arch_canon:    m68k:   m68k    6
 arch_canon:    IP:     sgi     7
@@ -181,7 +181,7 @@ buildarchtranslate: powerpc: ppc
 buildarchtranslate: powerppc: ppc
 buildarchtranslate: ppciseries: ppc
 buildarchtranslate: ppcpseries: ppc
-buildarchtranslate: pmac: ppc
+buildarchtranslate: ppcmac: ppc
 
 buildarchtranslate: atarist: m68kmint
 buildarchtranslate: atariste: m68kmint
@@ -220,7 +220,7 @@ arch_compat: powerpc: ppc
 arch_compat: powerppc: ppc
 arch_compat: ppciseries: ppc
 arch_compat: ppcpseries: ppc
-arch_compat: pmac: ppc
+arch_compat: ppcmac: ppc
 arch_compat: ppc: rs6000
 arch_compat: rs6000: noarch
 
@@ -313,7 +313,7 @@ buildarch_compat: m68k: noarch
 
 buildarch_compat: ppciseries: noarch
 buildarch_compat: ppcpseries: noarch
-buildarch_compat: pmac: noarch
+buildarch_compat: ppcmac: noarch
 buildarch_compat: ppc: noarch
 
 buildarch_compat: mipsel: noarch