- add aurora/sparc patches (#124469).

CVS patchset: 7252
CVS date: 2004/05/26 21:10:07

diff --git a/CHANGES b/CHANGES
index 6f7f845..5c11092 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,10 @@
        - fix: no transaction lock if --test was specified (#119783).
        - perl: skip new-fangled head[34] while generating deps (#118243).
        - perl: use __perl for perl variable macros (#115156).
+       ? make peace with libtool-1.5.6.
+       ? fix: follow current is_selinux_enabled() return (#121004).
+       ? fix: exit fail when erasing multiple identical packages (#120519).
+        - add aurora/sparc patches (#124469).
 
 4.2.2 -> 4.3:
        - upgrade to zlib-1.2.beta7.

diff --git a/configure.ac b/configure.ac
index 0b7a14d..176a54c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1097,8 +1097,8 @@ ia32e*)           RPMCANONCOLOR=3; RPMCANONARCH=ia32e ;;
 amd64*)                RPMCANONCOLOR=3; RPMCANONARCH=amd64 ;;
 x86_64*)       RPMCANONCOLOR=3; RPMCANONARCH=x86_64 ;;
 alpha*)                RPMCANONCOLOR=0; RPMCANONARCH=alpha ;;
-sparc64*)      RPMCANONCOLOR=0; RPMCANONARCH=sparc64 ;;
-sparc*)                RPMCANONCOLOR=0; RPMCANONARCH=sparc ;;
+sparc64*)      RPMCANONCOLOR=3; RPMCANONARCH=sparc64 ;;
+sparc*)                RPMCANONCOLOR=3; RPMCANONARCH=sparc ;;
 ia64*)         RPMCANONCOLOR=2; RPMCANONARCH=ia64;
                autorelocate_path='/emul/%%{ARCH}-%%{OS}' ;;
 s390x*)                RPMCANONCOLOR=3; RPMCANONARCH=s390x ;;

diff --git a/rpmrc.in b/rpmrc.in
index a680b3a..a78244f 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.62 2004/03/28 20:10:54 arekm Exp $
+# $Id: rpmrc.in,v 2.63 2004/05/26 21:10:07 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
@@ -86,6 +86,9 @@ arch_canon:   alphaev56: alphaev56    2
 arch_canon:    alphapca56:alphapca56   2
 arch_canon:    alphaev6: alphaev6      2
 arch_canon:    alphaev67: alphaev67    2
+# We always want to prefer sparc to sparc64.
+arch_canon:     sparc64:sparc64 2
+arch_canon:     sun4u:  sparc64 2
 
 arch_canon:    sparc:  sparc   3
 arch_canon:    sun4:   sparc   3
@@ -106,8 +109,6 @@ arch_canon: IP:     sgi     7
 arch_canon:     rs6000:        rs6000  8
 arch_canon:     ia64:  ia64    9
 
-arch_canon:    sparc64:sparc64 10
-arch_canon:    sun4u:  sparc64 10
 arch_canon:    mipsel: mipsel  11
 
 arch_canon:    armv3l: armv3l  12
@@ -256,6 +257,7 @@ arch_compat: sun4m: sparc
 arch_compat: sun4u: sparc64
 arch_compat: sparc64: sparcv9
 arch_compat: sparcv9: sparc
+arch_compat: sparcv8: sparc
 arch_compat: sparc: noarch
 
 arch_compat: mips: noarch