OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   26-Aug-2003 09:11:54
  Branch: OPENPKG_UPGRADE_RPM42            Handle: 2003082608115400

  Modified files:           (Branch: OPENPKG_UPGRADE_RPM42)
    openpkg-src/openpkg     rpmrc

  Log:
    reduce complexity and align with new platform ids

  Summary:
    Revision    Changes     Path
    1.12.2.3    +81 -159    openpkg-src/openpkg/rpmrc
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rpmrc
  ============================================================================
  $ cvs diff -u -r1.12.2.2 -r1.12.2.3 rpmrc
  --- openpkg-src/openpkg/rpmrc 23 Aug 2003 11:38:07 -0000      1.12.2.2
  +++ openpkg-src/openpkg/rpmrc 26 Aug 2003 07:11:54 -0000      1.12.2.3
  @@ -35,112 +35,87 @@
   macrofiles: 
@l_prefix@/lib/openpkg/macros:@l_prefix@/etc/openpkg/rpmmacros:~/.rpmmacros
   
   #
  -#   CPU Architectures
  +#   CPU Architecture Mappings
   #
   
  -#   Intel
  -buildarchtranslate: i386:       ix86
  -buildarchtranslate: i486:       ix86
  -buildarchtranslate: i586:       ix86
  -buildarchtranslate: i686:       ix86
  -buildarchtranslate: athlon:     ix86
  -buildarchtranslate: i86pc:      ix86
  -buildarchtranslate: ia64:       ia64
  -buildarch_compat:   i386:       ix86 noarch
  -buildarch_compat:   i486:       ix86 noarch
  -buildarch_compat:   i586:       ix86 noarch
  -buildarch_compat:   i686:       ix86 noarch
  -buildarch_compat:   athlon:     ix86 noarch
  -buildarch_compat:   i86pc:      ix86 noarch
  -buildarch_compat:   ia64:       ia64 ix86 noarch
  +#   Intel IA32/IA64
   arch_canon:         ix86:       ix86 1
   arch_canon:         ia64:       ia64 9
  -arch_compat:        i386:       ix86 noarch
  -arch_compat:        i486:       ix86 noarch
  -arch_compat:        i586:       ix86 noarch
  -arch_compat:        i686:       ix86 noarch
  -arch_compat:        athlon:     ix86 noarch
  -arch_compat:        i86pc:      ix86 noarch
  +arch_compat:        ix86:       ix86 noarch
  +buildarch_compat:   ix86:       ix86 noarch
   arch_compat:        ia64:       ia64 ix86 noarch
  +buildarch_compat:   ia64:       ia64 ix86 noarch
   
  -#   Alpha
  -buildarchtranslate: alphaev5:   alpha
  -buildarchtranslate: alphaev56:  alpha
  -buildarchtranslate: alphapca56: alpha
  -buildarchtranslate: alphaev6:   alpha
  -buildarchtranslate: alphaev67:  alpha
  -buildarch_compat:   alphaev5:   alpha noarch
  -buildarch_compat:   alphaev56:  alpha noarch
  -buildarch_compat:   alphapca56: alpha noarch
  -buildarch_compat:   alphaev6:   alpha noarch
  -buildarch_compat:   alphaev67:  alpha noarch
  +#   Compaq Alpha
   arch_canon:         alpha:      alpha 2
  -arch_compat:        alphaev5:   alpha noarch
  -arch_compat:        alphaev56:  alpha noarch
  -arch_compat:        alphapca56: alpha noarch
  -arch_compat:        alphaev6:   alpha noarch
  -arch_compat:        alphaev67:  alpha noarch
  -
  -#   SPARC
  -buildarchtranslate: sun4c:      sparc
  -buildarchtranslate: sun4d:      sparc
  -buildarchtranslate: sun4m:      sparc
  -buildarchtranslate: sun4u:      sparc64
  -buildarch_compat:   sun4c:      sparc   noarch
  -buildarch_compat:   sun4d:      sparc   noarch
  -buildarch_compat:   sun4m:      sparc   noarch
  -buildarch_compat:   sun4u:      sparc64 sparc noarch
  +arch_compat:        alpha:      alpha noarch
  +buildarch_compat:   alpha:      alpha noarch
  +
  +#   Sun SPARC
   arch_canon:         sparc:      sparc   3
   arch_canon:         sparc64:    sparc64 3
  -arch_compat:        sun4c:      sparc   noarch
  -arch_compat:        sun4d:      sparc   noarch
  -arch_compat:        sun4m:      sparc   noarch
  -arch_compat:        sun4u:      sparc64 sparc noarch
  -
  -#   PA-RISC
  -buildarchtranslate: 9000/778:   hppa
  -buildarch_compat:   9000/778:   hppa    noarch
  -arch_canon:         hppa:       hppa    4
  -arch_compat:        9000/778:   hppa    noarch
  +arch_compat:        sparc:      sparc noarch
  +buildarch_compat:   sparc:      sparc noarch
  +arch_compat:        sparc64:    sparc64 sparc noarch
  +buildarch_compat:   sparc64:    sparc64 sparc noarch
  +
  +#   HP PA-RISC
  +arch_canon:         hppa:       hppa 4
  +arch_compat:        hppa:       hppa noarch
  +buildarch_compat:   hppa:       hppa noarch
   
   #
  -#   Operating Systems
  +#   Operating System Mappings
   #
   
  -#   Linux
  -buildostranslate:   Linux2.0:   linux2.0
  -buildostranslate:   Linux2.1:   linux2.1
  -buildostranslate:   Linux2.2:   linux2.2
  -buildostranslate:   Linux2.3:   linux2.3
  -buildostranslate:   Linux2.4:   linux2.4
  -buildostranslate:   Linux2.5:   linux2.5
  -buildostranslate:   Linux2.6:   linux2.6
  -os_canon:           linux2.0:   linux2.0 1
  -os_canon:           linux2.1:   linux2.1 1
  -os_canon:           linux2.2:   linux2.2 1
  -os_canon:           linux2.3:   linux2.3 1
  -os_canon:           linux2.4:   linux2.4 1
  -os_canon:           linux2.5:   linux2.5 1
  -os_canon:           linux2.6:   linux2.6 1
  -os_compat:          Linux2.0:   linux2.0
  -os_compat:          Linux2.1:   linux2.1 linux2.0
  -os_compat:          Linux2.2:   linux2.2 linux2.1 linux2.0 
  -os_compat:          Linux2.3:   linux2.3 linux2.2 linux2.1 linux2.0 
  -os_compat:          Linux2.4:   linux2.4 linux2.3 linux2.2 linux2.1 linux2.0 
  -os_compat:          Linux2.5:   linux2.5 linux2.4 linux2.3 linux2.2 linux2.1 
linux2.0 
  -os_compat:          Linux2.6:   linux2.6 linux2.5 linux2.4 linux2.3 linux2.2 
linux2.1 linux2.0 
  -
  -#   Solaris
  -buildostranslate:   SunOS5.0:   solaris2.0
  -buildostranslate:   SunOS5.1:   solaris2.1
  -buildostranslate:   SunOS5.2:   solaris2.2
  -buildostranslate:   SunOS5.3:   solaris2.3
  -buildostranslate:   SunOS5.4:   solaris2.4
  -buildostranslate:   SunOS5.5:   solaris2.5
  -buildostranslate:   SunOS5.6:   solaris2.6
  -buildostranslate:   SunOS5.7:   solaris2.7
  -buildostranslate:   SunOS5.8:   solaris2.8
  -buildostranslate:   SunOS5.9:   solaris2.9
  +#   FreeBSD
  +os_canon:           freebsd4.0: freebsd 8
  +os_canon:           freebsd4.1: freebsd 8
  +os_canon:           freebsd4.2: freebsd 8
  +os_canon:           freebsd4.3: freebsd 8
  +os_canon:           freebsd4.4: freebsd 8
  +os_canon:           freebsd4.5: freebsd 8
  +os_canon:           freebsd4.6: freebsd 8
  +os_canon:           freebsd4.7: freebsd 8
  +os_canon:           freebsd4.8: freebsd 8
  +os_canon:           freebsd4.9: freebsd 8
  +os_canon:           freebsd5.0: freebsd 8
  +os_canon:           freebsd5.1: freebsd 8
  +os_canon:           freebsd5.2: freebsd 8
  +os_canon:           freebsd5.3: freebsd 8
  +os_compat:          freebsd4.0: freebsd4.0 
  +os_compat:          freebsd4.1: freebsd4.1 freebsd4.0
  +os_compat:          freebsd4.2: freebsd4.2 freebsd4.1 freebsd4.0
  +os_compat:          freebsd4.3: freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0
  +os_compat:          freebsd4.4: freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 
freebsd4.0
  +os_compat:          freebsd4.5: freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 
freebsd4.1 freebsd4.0
  +os_compat:          freebsd4.6: freebsd4.6 freebsd4.5 freebsd4.4 freebsd4.3 
freebsd4.2 freebsd4.1 freebsd4.0
  +os_compat:          freebsd4.7: freebsd4.7 freebsd4.6 freebsd4.5 freebsd4.4 
freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0
  +os_compat:          freebsd4.8: freebsd4.8 freebsd4.7 freebsd4.6 freebsd4.5 
freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0
  +os_compat:          freebsd4.9: freebsd4.9 freebsd4.8 freebsd4.7 freebsd4.6 
freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0
  +os_compat:          freebsd5.0: freebsd5.0
  +os_compat:          freebsd5.1: freebsd5.1 freebsd5.0
  +os_compat:          freebsd5.2: freebsd5.2 freebsd5.1 freebsd5.0
  +os_compat:          freebsd5.3: freebsd5.3 freebsd5.2 freebsd5.1 freebsd5.0
  +
  +#   GNU/Linux
  +os_canon:           redhat8.0:  linux 1
  +os_canon:           redhat8.1:  linux 1
  +os_canon:           redhat8.2:  linux 1
  +os_canon:           redhat9:    linux 1
  +os_canon:           suse8.0:    linux 1
  +os_canon:           suse8.1:    linux 1
  +os_canon:           suse8.2:    linux 1
  +os_canon:           suse8.3:    linux 1
  +os_compat:          redhat8.0:  redhat8.0
  +os_compat:          redhat8.1:  redhat8.1 redhat8.0
  +os_compat:          redhat8.2:  redhat8.2 redhat8.1 redhat8.0
  +os_compat:          redhat9:    redhat9   redhat8.2 redhat8.1 redhat8.0
  +os_compat:          suse8.0:    suse8.0
  +os_compat:          suse8.1:    suse8.1 suse8.0
  +os_compat:          suse8.2:    suse8.2 suse8.1 suse8.0
  +
  +#   Sun Solaris
   os_canon:           solaris2.0: solaris2.0 3
   os_canon:           solaris2.1: solaris2.1 3
   os_canon:           solaris2.2: solaris2.2 3
  @@ -148,70 +123,17 @@
   os_canon:           solaris2.4: solaris2.4 3
   os_canon:           solaris2.5: solaris2.5 3
   os_canon:           solaris2.6: solaris2.6 3
  -os_canon:           solaris2.7: solaris2.7 3
  -os_canon:           solaris2.8: solaris2.8 3
  -os_canon:           solaris2.9: solaris2.9 3
  -os_compat:          SunOS5.0:   solaris2.0
  -os_compat:          SunOS5.1:   solaris2.1 solaris2.0
  -os_compat:          SunOS5.2:   solaris2.2 solaris2.1 solaris2.0
  -os_compat:          SunOS5.3:   solaris2.3 solaris2.2 solaris2.1 solaris2.0
  -os_compat:          SunOS5.4:   solaris2.4 solaris2.3 solaris2.2 solaris2.1 
solaris2.0
  -os_compat:          SunOS5.5:   solaris2.5 solaris2.4 solaris2.3 solaris2.2 
solaris2.1 solaris2.0
  -os_compat:          SunOS5.6:   solaris2.6 solaris2.5 solaris2.4 solaris2.3 
solaris2.2 solaris2.1 solaris2.0
  -os_compat:          SunOS5.7:   solaris2.7 solaris2.6 solaris2.5 solaris2.4 
solaris2.3 solaris2.2 solaris2.1 solaris2.0
  -os_compat:          SunOS5.8:   solaris2.8 solaris2.7 solaris2.6 solaris2.5 
solaris2.4 solaris2.3 solaris2.2 solaris2.1 solaris2.0
  -os_compat:          SunOS5.9:   solaris2.9 solaris2.8 solaris2.7 solaris2.6 
solaris2.5 solaris2.4 solaris2.3 solaris2.2 solaris2.1 solaris2.0
  -
  -#   FreeBSD
  -buildostranslate:   FreeBSD4.0: freebsd4.0
  -buildostranslate:   FreeBSD4.1: freebsd4.1
  -buildostranslate:   FreeBSD4.2: freebsd4.2
  -buildostranslate:   FreeBSD4.3: freebsd4.3
  -buildostranslate:   FreeBSD4.4: freebsd4.4
  -buildostranslate:   FreeBSD4.5: freebsd4.5
  -buildostranslate:   FreeBSD4.6: freebsd4.6
  -buildostranslate:   FreeBSD4.7: freebsd4.7
  -buildostranslate:   FreeBSD4.8: freebsd4.8
  -buildostranslate:   FreeBSD4.9: freebsd4.9
  -buildostranslate:   FreeBSD5.0: freebsd5.0
  -buildostranslate:   FreeBSD5.1: freebsd5.1
  -buildostranslate:   FreeBSD5.2: freebsd5.2
  -os_canon:           freebsd4.0: freebsd4.0 8
  -os_canon:           freebsd4.1: freebsd4.1 8
  -os_canon:           freebsd4.2: freebsd4.2 8
  -os_canon:           freebsd4.3: freebsd4.3 8
  -os_canon:           freebsd4.4: freebsd4.4 8
  -os_canon:           freebsd4.5: freebsd4.5 8
  -os_canon:           freebsd4.6: freebsd4.6 8
  -os_canon:           freebsd4.7: freebsd4.7 8
  -os_canon:           freebsd4.8: freebsd4.8 8
  -os_canon:           freebsd4.9: freebsd4.9 8
  -os_compat:          FreeBSD4.0: freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD4.1: freebsd4.1 freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD4.2: freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD4.3: freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 
linux2.0 linux2.2
  -os_compat:          FreeBSD4.4: freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 
freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD4.5: freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 
freebsd4.1 freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD4.6: freebsd4.6 freebsd4.5 freebsd4.4 freebsd4.3 
freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD4.7: freebsd4.7 freebsd4.6 freebsd4.5 freebsd4.4 
freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD4.8: freebsd4.8 freebsd4.7 freebsd4.6 freebsd4.5 
freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD4.9: freebsd4.9 freebsd4.8 freebsd4.7 freebsd4.6 
freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD5.0: freebsd5.0 freebsd4.6 freebsd4.5 freebsd4.4 
freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD5.1: freebsd5.1 freebsd5.0 freebsd4.6 freebsd4.5 
freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
  -os_compat:          FreeBSD5.2: freebsd5.2 freebsd5.1 freebsd5.0 freebsd4.6 
freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
  -
  -#   Tru64
  -buildostranslate:   osf15.0:    osf5.0
  -buildostranslate:   OSF1V5.0:   osf5.0
  -buildostranslate:   OSF1V5.1:   osf5.1
  -os_canon:           osf5.0:     osf5.0 9
  -os_canon:           osf5.1:     osf5.1 9
  -os_compat:          osf15.0:    osf5.0
  -os_compat:          OSF1V5.0:   osf5.0
  -os_compat:          OSF1V5.1:   osf5.0 osf5.1
  -
  -#   HP-UX
  -buildostranslate:   hp-ux10.20: hpux10.20
  -os_canon:           hpux10.20:  hpux10.20 10
  -os_compat:          hp-ux10.20: hpux10.20
  +os_canon:           solaris7:   solaris7   3
  +os_canon:           solaris8:   solaris8   3
  +os_canon:           solaris9:   solaris9   3
  +os_compat:          solaris2.0: solaris2.0
  +os_compat:          solaris2.1: solaris2.1 solaris2.0
  +os_compat:          solaris2.2: solaris2.2 solaris2.1 solaris2.0
  +os_compat:          solaris2.3: solaris2.3 solaris2.2 solaris2.1 solaris2.0
  +os_compat:          solaris2.4: solaris2.4 solaris2.3 solaris2.2 solaris2.1 
solaris2.0
  +os_compat:          solaris2.5: solaris2.5 solaris2.4 solaris2.3 solaris2.2 
solaris2.1 solaris2.0
  +os_compat:          solaris2.6: solaris2.6 solaris2.5 solaris2.4 solaris2.3 
solaris2.2 solaris2.1 solaris2.0
  +os_compat:          solaris7:   solaris7   solaris2.6 solaris2.5 solaris2.4 
solaris2.3 solaris2.2 solaris2.1 solaris2.0
  +os_compat:          solaris8:   solaris8   solaris7   solaris2.6 solaris2.5 
solaris2.4 solaris2.3 solaris2.2 solaris2.1 solaris2.0
  +os_compat:          solaris9:   solaris9   solaris8   solaris7   solaris2.6 
solaris2.5 solaris2.4 solaris2.3 solaris2.2 solaris2.1 solaris2.0
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to