RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   20-Jul-2008 02:04:51
  Branch: HEAD                             Handle: 2008072000045100

  Modified files:
    rpm                     CHANGES macros.in

  Log:
    - jbj: add alternative %{sparcx} macro shorthand (bz #455972).

  Summary:
    Revision    Changes     Path
    1.2508      +4  -0      rpm/CHANGES
    1.250       +5  -2      rpm/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2507 -r1.2508 CHANGES
  --- rpm/CHANGES       19 Jul 2008 19:28:51 -0000      1.2507
  +++ rpm/CHANGES       20 Jul 2008 00:04:51 -0000      1.2508
  @@ -1,5 +1,9 @@
   
   5.1.0 -> 5.2a0:
  +    - jbj: add alternative %{sparcx} macro shorthand (bz #455972).
  +    - jbj: rpmio: add new link/unlink methods to loader map.
  +    - jbj: python: add rpm.Keyring/rpm.Pubkey subtype methods for rpmkeyring.
  +    - jbj: python: convert rpmtd-py to rpm style includes.
       - jbj: filetriggers: rewite w splint annotations. much more todo++ here.
       - jbj: keyring: (re-)port keyring.[ch] w refcounts.
       - rpm.org: (re-)steal rpmkeyring.[ch] with added refcounts.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.249 -r1.250 macros.in
  --- rpm/macros.in     4 Jul 2008 02:36:15 -0000       1.249
  +++ rpm/macros.in     20 Jul 2008 00:04:51 -0000      1.250
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.249 2008/07/04 02:36:15 jbj Exp $
  +# $Id: macros.in,v 1.250 2008/07/20 00:04:51 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
  @@ -1468,7 +1468,10 @@
   %alpha  alpha alphaev56 alphaev6 alphaev67
   
   # and sparc
  -%sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparc64 sparc64v 
sparcv9b sparcv9v sparcv9v2
  +%sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
  +
  +# add alternative sparc architectures macro (bugzilla #455972 patch)
  +%sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
   
   #------------------------------------------------------------------------
   # Use in %install to generate locale specific file lists. For example,
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to