summaryrefslogtreecommitdiff
path: root/rpmrc.in
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2003-05-30 16:58:13 +0000
committerjbj <devnull@localhost>2003-05-30 16:58:13 +0000
commitf5c14e57bc86454af679c407e9799d51706bd833 (patch)
tree77c3204ac9db12893bc8ed08873c9d82f6ebe556 /rpmrc.in
parent1c5f871b492f0b28d053f45881faba2f24d9c077 (diff)
downloadrpm-f5c14e57bc86454af679c407e9799d51706bd833.tar.gz
Consolidate external beecrypt changes.
CVS patchset: 6880 CVS date: 2003/05/30 16:58:13
Diffstat (limited to 'rpmrc.in')
-rw-r--r--rpmrc.in10
1 files changed, 8 insertions, 2 deletions
diff --git a/rpmrc.in b/rpmrc.in
index c68c4484a..bc71c2ea1 100644
--- 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.54 2003/01/10 20:34:26 jbj Exp $
+# $Id: rpmrc.in,v 2.55 2003/05/30 16:58:13 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
@@ -118,6 +118,8 @@ arch_canon: i370: i370 14
arch_canon: s390x: s390x 15
arch_canon: ppc64: ppc64 16
+arch_canon: ppc64pseries: ppc64pseries 16
+arch_canon: ppc64iseries: ppc64iseries 16
arch_canon: sh: sh 17
arch_canon: xtensa: xtensa 18
@@ -228,6 +230,8 @@ arch_compat: ppcpseries: ppc
arch_compat: ppc64: ppc
arch_compat: ppc: rs6000
arch_compat: rs6000: noarch
+arch_compat: ppc64pseries: ppc64
+arch_compat: ppc64iseries: ppc64
arch_compat: sun4c: sparc
arch_compat: sun4d: sparc
@@ -264,7 +268,7 @@ arch_compat: s390x: s390 noarch
arch_compat: ia64: i686 noarch
-arch_compat: x86_64: noarch
+arch_compat: x86_64: athlon noarch
os_compat: IRIX64: IRIX
os_compat: solaris2.7: solaris2.3 solaris2.4 solaris2.5 solaris2.6
@@ -322,6 +326,8 @@ buildarch_compat: ppciseries: noarch
buildarch_compat: ppcpseries: noarch
buildarch_compat: ppc: noarch
buildarch_compat: ppc64: noarch
+buildarch_compat: ppc64pseries: ppc64
+buildarch_compat: ppc64iseries: ppc64
buildarch_compat: mips: noarch
buildarch_compat: mipsel: noarch