move arch_compat lines to usr.lib.rpmrc

add arch_compat lines for mklinux stuff

CVS patchset: 854
CVS date: 1996/07/16 15:20:52

diff --git a/lib-rpmrc.in b/lib-rpmrc.in
index e12a4b6..5390af1 100644 (file)
--- a/lib-rpmrc.in
+++ b/lib-rpmrc.in
@@ -3,38 +3,32 @@
 #############################################################
 # Canonical arch names and numbers
 
-arch_canon: i986: i986 1
-arch_canon: i886: i886 1
-arch_canon: i786: i786 1
-arch_canon: i686: i686 1
-arch_canon: i586: i586 1
-arch_canon: i486: i486 1
-arch_canon: i386: i386 1
-
-arch_canon: alpha: axp 2
-
-arch_canon: sparc: sparc 3
-arch_canon: sun4:  sparc 3
-
+arch_canon:    i986:   i986    1
+arch_canon:    i886:   i886    1
+arch_canon:    i786:   i786    1
+arch_canon:    i686:   i686    1
+arch_canon:    i586:   i586    1
+arch_canon:    i486:   i486    1
+arch_canon:    i386:   i386    1
+arch_canon:    alpha:  axp     2
+arch_canon:    sparc:  sparc   3
+arch_canon:    sun4:   sparc   3
 # This is really a place holder for MIPS.
-arch_canon: mips: mips 4
-
-arch_canon: ppc:          ppc 5
-
+arch_canon:    mips:   mips    4
+arch_canon:    ppc:    ppc     5
 # This is really a place holder for 68000
-arch_canon: 68000: 68k 6
-
+arch_canon:    68000:  68k     6
 # This is wrong.
-arch_canon: IP: sgi 7
+arch_canon:    IP:     sgi     7
 
 #############################################################
 # Canonical OS names and numbers
 
-os_canon: Linux:  Linux   1
-os_canon: IRIX:   Irix    2
+os_canon:      Linux:  Linux   1
+os_canon:      IRIX:   Irix    2
 # This is wrong
-os_canon: SunOS5: solaris 3
-os_canon: SunOS4: SunOS   4
+os_canon:      SunOS5: solaris 3
+os_canon:      SunOS4: SunOS   4
 
 #############################################################
 # For a given uname().machine, the default build arch
@@ -56,3 +50,22 @@ buildarchtranslate: i486: i386
 buildarchtranslate: i386: i386
 
 buildarchtranslate: osfmach3_ppc: ppc
+
+#############################################################
+# Architecture compatibility
+
+arch_compat: i986: i886
+arch_compat: i886: i786
+arch_compat: i786: i686
+arch_compat: i686: i586
+arch_compat: i586: i486
+arch_compat: i486: i386
+
+arch_compat: osfmach3_i986: i986
+arch_compat: osfmach3_i886: i886
+arch_compat: osfmach3_i786: i786
+arch_compat: osfmach3_i686: i686
+arch_compat: osfmach3_i586: i586
+arch_compat: osfmach3_i486: i486
+
+arch_compat: osfmach3_ppc: ppc