summaryrefslogtreecommitdiff
path: root/rpmrc.in
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2000-06-21 23:48:05 +0000
committerjbj <devnull@localhost>2000-06-21 23:48:05 +0000
commit8393e93bc833a2b0f14691f67896646f53bd9965 (patch)
tree54c6d06d0aef04779d995f33f8e2403291ffd270 /rpmrc.in
parentfab0493dbe64fd7448dd8f269acf7b07f8136f94 (diff)
downloadlibrpm-tizen-8393e93bc833a2b0f14691f67896646f53bd9965.tar.gz
librpm-tizen-8393e93bc833a2b0f14691f67896646f53bd9965.tar.bz2
librpm-tizen-8393e93bc833a2b0f14691f67896646f53bd9965.zip
- uname on i370 has s390 as arch (#11456).
CVS patchset: 3888 CVS date: 2000/06/21 23:48:05
Diffstat (limited to 'rpmrc.in')
-rw-r--r--rpmrc.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/rpmrc.in b/rpmrc.in
index b495cc075..55ccb5f51 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,4 +1,4 @@
-# $Id: rpmrc.in,v 2.25 2000/06/20 16:29:23 jbj Exp $
+# $Id: rpmrc.in,v 2.26 2000/06/21 23:48:05 jbj Exp $
#############################################################
@@ -77,8 +77,8 @@ arch_canon: falcon: m68kmint 13
arch_canon: atariclone: m68kmint 13
arch_canon: milan: m68kmint 13
arch_canon: hades: m68kmint 13
+arch_canon: s390: s390 14
arch_canon: i370: i370 14
-arch_canon: i390: i390 15
#############################################################
# Canonical OS names and numbers
@@ -196,7 +196,7 @@ arch_compat: atariclone: m68kmint noarch
arch_compat: milan: m68kmint noarch
arch_compat: hades: m68kmint noarch
-arch_compat: i390: i370
+arch_compat: s390: i370
arch_compat: i370: noarch
arch_compat: ia64: noarch
@@ -258,7 +258,7 @@ buildarch_compat: milan: m68kmint noarch
buildarch_compat: hades: m68kmint noarch
buildarch_compat: ia64: noarch
-buildarch_compat: i390: noarch
+buildarch_compat: s390: noarch
macrofiles: @RPMCONFIGDIR@/macros:@RPMCONFIGDIR@/%{_target}/macros:@SYSCONFIGDIR@/macros.specspo:@SYSCONFIGDIR@/macros:@SYSCONFIGDIR@/%{_target}/macros:~/.rpmmacros