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

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarl...@rpm5.org
  Module: rpm                              Date:   29-Jul-2011 03:14:07
  Branch: rpm-5_3                          Handle: 2011072901140600

  Modified files:           (Branch: rpm-5_3)
    rpm                     CHANGES
    rpm/macros              macros.rpmbuild.in

  Log:
    rename armv7hl to armv7l
    (http://lists.fedoraproject.org/pipermail/arm/2011-July/001596.html)

  Summary:
    Revision    Changes     Path
    1.3296.2.246+1  -1      rpm/CHANGES
    1.4.2.5     +2  -2      rpm/macros/macros.rpmbuild.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3296.2.245 -r1.3296.2.246 CHANGES
  --- rpm/CHANGES       28 Jul 2011 07:52:57 -0000      1.3296.2.245
  +++ rpm/CHANGES       29 Jul 2011 01:14:06 -0000      1.3296.2.246
  @@ -1,5 +1,5 @@
   5.3.12 -> 5.3.13
  -    - proyvind: add armv7hl to %arm (from Paulo Andrade 
<p...@mandriva.com.br>).
  +    - proyvind: add armv7l to %arm (from Paulo Andrade 
<p...@mandriva.com.br>).
       - proyvind: fix rpm not comparing distepoch if missing from one package
        when doing comparision.
       - proyvind: fix rpm treating packages of same NVRA, but different 
distepoch
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  ============================================================================
  $ cvs diff -u -r1.4.2.4 -r1.4.2.5 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in     28 Jul 2011 07:52:58 -0000      1.4.2.4
  +++ rpm/macros/macros.rpmbuild.in     29 Jul 2011 01:14:06 -0000      1.4.2.5
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.2.4 2011/07/28 07:52:58 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.2.5 2011/07/29 01:14:06 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -633,7 +633,7 @@
   %efi %{ix86} x86_64 ia64
   
   # same thing for arm
  -%arm    arm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
  +%arm    arm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l armv7l
   
   # same for alpha
   %alpha  alpha alphaev56 alphaev6 alphaev67
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to