[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen
  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:   28-Jul-2011 09:50:40
  Branch: HEAD Handle: 2011072807503901

  Modified files:
rpm CHANGES
rpm/macros  macros.rpmbuild.in

  Log:
add armv7hl to %arm (from Paulo Andrade p...@mandriva.com.br).

  Summary:
RevisionChanges Path
1.3663  +1  -0  rpm/CHANGES
1.9 +2  -2  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3662 -r1.3663 CHANGES
  --- rpm/CHANGES   12 Jul 2011 10:41:19 -  1.3662
  +++ rpm/CHANGES   28 Jul 2011 07:50:39 -  1.3663
  @@ -1,4 +1,5 @@
   HEAD:
  +- proyvind: add armv7hl 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.8 -r1.9 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 26 May 2011 14:26:27 -  1.8
  +++ rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:50:40 -  1.9
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.8 2011/05/26 14:26:27 devzero2000 Exp $
  +# $Id: macros.rpmbuild.in,v 1.9 2011/07/28 07:50:40 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -634,7 +634,7 @@
   %efi %{ix86} x86_64 ia64
   
   # same thing for arm
  -%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l
  +%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
   
   # same for alpha
   %alpha  alpha alphaev56 alphaev6 alphaev67
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen
  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:   28-Jul-2011 09:52:58
  Branch: rpm-5_3  Handle: 2011072807525701

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

  Log:
add armv7hl to %arm (from Paulo Andrade p...@mandriva.com.br).

  Summary:
RevisionChanges Path
1.3296.2.245+1  -0  rpm/CHANGES
1.4.2.4 +2  -2  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3296.2.244 -r1.3296.2.245 CHANGES
  --- rpm/CHANGES   12 Jul 2011 10:45:05 -  1.3296.2.244
  +++ rpm/CHANGES   28 Jul 2011 07:52:57 -  1.3296.2.245
  @@ -1,4 +1,5 @@
   5.3.12 - 5.3.13
  +- proyvind: add armv7hl 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.3 -r1.4.2.4 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 9 May 2011 16:01:41 -   1.4.2.3
  +++ rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:52:58 -  1.4.2.4
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.2.3 2011/05/09 16:01:41 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.2.4 2011/07/28 07:52:58 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -633,7 +633,7 @@
   %efi %{ix86} x86_64 ia64
   
   # same thing for arm
  -%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l
  +%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
   
   # same for alpha
   %alpha  alpha alphaev56 alphaev6 alphaev67
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen
  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:11:59
  Branch: HEAD Handle: 2011072901115900

  Modified files:
rpm CHANGES
rpm/macros  macros.rpmbuild.in

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

  Summary:
RevisionChanges Path
1.3664  +1  -1  rpm/CHANGES
1.10+2  -2  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3663 -r1.3664 CHANGES
  --- rpm/CHANGES   28 Jul 2011 07:50:39 -  1.3663
  +++ rpm/CHANGES   29 Jul 2011 01:11:59 -  1.3664
  @@ -1,5 +1,5 @@
   HEAD:
  -- 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.9 -r1.10 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:50:40 -  1.9
  +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:11:59 -  1.10
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.9 2011/07/28 07:50:40 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.10 2011/07/29 01:11:59 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -634,7 +634,7 @@
   %efi %{ix86} x86_64 ia64
   
   # same thing for arm
  -%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
  +%armarm 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 Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen
  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:13:23
  Branch: rpm-5_4  Handle: 2011072901132300

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

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

  Summary:
RevisionChanges Path
1.3501.2.149+1  -1  rpm/CHANGES
1.4.4.5 +2  -2  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.148 -r1.3501.2.149 CHANGES
  --- rpm/CHANGES   28 Jul 2011 07:51:47 -  1.3501.2.148
  +++ rpm/CHANGES   29 Jul 2011 01:13:23 -  1.3501.2.149
  @@ -1,5 +1,5 @@
   5.4.1 - 5.4.2
  -- 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.4.4 -r1.4.4.5 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:51:48 -  1.4.4.4
  +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:13:23 -  1.4.4.5
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.4 2011/07/28 07:51:48 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.5 2011/07/29 01:13:23 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -633,7 +633,7 @@
   %efi %{ix86} x86_64 ia64
   
   # same thing for arm
  -%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
  +%armarm 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 Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen
  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:
RevisionChanges 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 -  1.3296.2.245
  +++ rpm/CHANGES   29 Jul 2011 01:14:06 -  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 -  1.4.2.4
  +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:14:06 -  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
  -%armarm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b 
armv5te armv5tel armv5teb xscale armv6 armv6l armv7hl
  +%armarm 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 Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen
  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:59:41
  Branch: HEAD Handle: 2011072901594100

  Modified files:
rpm CHANGES
rpm/macros  macros.rpmbuild.in

  Log:
try sanitize %sparc vs %sparcx inconsistencies, make %sparc all 32 bit
sparc archs only, with %sparcx being all 32 bit archs AND 64 bit archs

  Summary:
RevisionChanges Path
1.3665  +3  -0  rpm/CHANGES
1.11+3  -3  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3664 -r1.3665 CHANGES
  --- rpm/CHANGES   29 Jul 2011 01:11:59 -  1.3664
  +++ rpm/CHANGES   29 Jul 2011 01:59:41 -  1.3665
  @@ -1,4 +1,7 @@
   HEAD:
  +- proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
  + all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
  + 64 bit archs
   - 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.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.10 -r1.11 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:11:59 -  1.10
  +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:59:41 -  1.11
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.10 2011/07/29 01:11:59 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.11 2011/07/29 01:59:41 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -640,10 +640,10 @@
   %alpha  alpha alphaev56 alphaev6 alphaev67
   
   # and sparc
  -%sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
  +%sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v 
sparcv9v2
   
   # add alternative sparc architectures macro (bugzilla #455972 patch)
  -%sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
  +%sparcx %sparc sparc64 sparc64v
   
   # also for mips
   %mips mips mips2 mips3 mips4 octeon
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen
  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 04:03:02
  Branch: rpm-5_4  Handle: 2011072902030100

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

  Log:
try sanitize %sparc vs %sparcx inconsistencies, make %sparc all 32 bit
sparc archs only, with %sparcx being all 32 bit archs AND 64 bit archs

  Summary:
RevisionChanges Path
1.3501.2.150+3  -0  rpm/CHANGES
1.4.4.6 +3  -3  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.149 -r1.3501.2.150 CHANGES
  --- rpm/CHANGES   29 Jul 2011 01:13:23 -  1.3501.2.149
  +++ rpm/CHANGES   29 Jul 2011 02:03:01 -  1.3501.2.150
  @@ -1,4 +1,7 @@
   5.4.1 - 5.4.2
  +- proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
  + all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
  + 64 bit archs
   - 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.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.4.5 -r1.4.4.6 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:13:23 -  1.4.4.5
  +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 02:03:01 -  1.4.4.6
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.4.5 2011/07/29 01:13:23 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.4.6 2011/07/29 02:03:01 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -639,10 +639,10 @@
   %alpha  alpha alphaev56 alphaev6 alphaev67
   
   # and sparc
  -%sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
  +%sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v 
sparcv9v2
   
   # add alternative sparc architectures macro (bugzilla #455972 patch)
  -%sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
  +%sparcx %sparc sparc64 sparc64v
   
   # also for mips
   %mips mips mips2 mips3 mips4 octeon
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen
  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 06:16:07
  Branch: rpm-5_3  Handle: 2011072904160600

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

  Log:
try sanitize %sparc vs %sparcx inconsistencies, make %sparc all 32 bit
sparc archs only, with %sparcx being all 32 bit archs AND 64 bit archs

  Summary:
RevisionChanges Path
1.3296.2.247+3  -0  rpm/CHANGES
1.4.2.6 +3  -3  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3296.2.246 -r1.3296.2.247 CHANGES
  --- rpm/CHANGES   29 Jul 2011 01:14:06 -  1.3296.2.246
  +++ rpm/CHANGES   29 Jul 2011 04:16:06 -  1.3296.2.247
  @@ -1,4 +1,7 @@
   5.3.12 - 5.3.13
  +- proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
  + all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
  + 64 bit archs
   - 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.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.2.5 -r1.4.2.6 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:14:06 -  1.4.2.5
  +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:16:06 -  1.4.2.6
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.2.5 2011/07/29 01:14:06 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.2.6 2011/07/29 04:16:06 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -639,10 +639,10 @@
   %alpha  alpha alphaev56 alphaev6 alphaev67
   
   # and sparc
  -%sparc sun4 sun4m sun4c sun4d sun4u sparcv9b sparcv9v2 %{sparcx}
  +%sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v 
sparcv9v2
   
   # add alternative sparc architectures macro (bugzilla #455972 patch)
  -%sparcx sparc sparcv8 sparcv9 sparcv9v sparc64 sparc64v
  +%sparcx %sparc sparc64 sparc64v
   
   # also for mips
   %mips mips mips2 mips3 mips4 octeon
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen
  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 06:26:06
  Branch: HEAD Handle: 2011072904260600

  Modified files:
rpm CHANGES
rpm/macros  macros.rpmbuild.in

  Log:
add sparc64v2 arch to %sparcx

  Summary:
RevisionChanges Path
1.3666  +2  -1  rpm/CHANGES
1.12+2  -2  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3665 -r1.3666 CHANGES
  --- rpm/CHANGES   29 Jul 2011 01:59:41 -  1.3665
  +++ rpm/CHANGES   29 Jul 2011 04:26:06 -  1.3666
  @@ -1,7 +1,8 @@
   HEAD:
  +- proyvind: add sparc64v2 arch to %sparcx.
   - proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
  - 64 bit archs
  + 64 bit archs.
   - 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.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.11 -r1.12 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 01:59:41 -  1.11
  +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:26:06 -  1.12
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.11 2011/07/29 01:59:41 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.12 2011/07/29 04:26:06 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -643,7 +643,7 @@
   %sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v 
sparcv9v2
   
   # add alternative sparc architectures macro (bugzilla #455972 patch)
  -%sparcx %sparc sparc64 sparc64v
  +%sparcx %sparc sparc64 sparc64v sparc64v2
   
   # also for mips
   %mips mips mips2 mips3 mips4 octeon
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/macros/ macros.rpmbuild.in

2011-07-28 Thread Per �yvind Karlsen
  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 06:27:50
  Branch: rpm-5_3  Handle: 2011072904274901

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

  Log:
add sparc64v2 arch to %sparcx

  Summary:
RevisionChanges Path
1.3296.2.248+2  -1  rpm/CHANGES
1.4.2.7 +2  -2  rpm/macros/macros.rpmbuild.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3296.2.247 -r1.3296.2.248 CHANGES
  --- rpm/CHANGES   29 Jul 2011 04:16:06 -  1.3296.2.247
  +++ rpm/CHANGES   29 Jul 2011 04:27:49 -  1.3296.2.248
  @@ -1,7 +1,8 @@
   5.3.12 - 5.3.13
  +- proyvind: add sparc64v2 arch to %sparcx.
   - proyvind: try sanitize %sparc vs %sparcx inconsistencies, make %sparc
all 32 bit sparc archs only, with %sparcx being all 32 bit archs AND
  - 64 bit archs
  + 64 bit archs.
   - 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.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/macros/macros.rpmbuild.in
  
  $ cvs diff -u -r1.4.2.6 -r1.4.2.7 macros.rpmbuild.in
  --- rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:16:06 -  1.4.2.6
  +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:27:50 -  1.4.2.7
  @@ -1,7 +1,7 @@
   #/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
   # \verbatim
   #
  -# $Id: macros.rpmbuild.in,v 1.4.2.6 2011/07/29 04:16:06 pkarlsen Exp $
  +# $Id: macros.rpmbuild.in,v 1.4.2.7 2011/07/29 04:27:50 pkarlsen Exp $
   #
   # This file contains rpmbuild configuration macros.
   #
  @@ -642,7 +642,7 @@
   %sparc sun4 sun4m sun4c sun4d sun4u sparc sparcv8 sparcv9 sparcv9b sparc9v 
sparcv9v2
   
   # add alternative sparc architectures macro (bugzilla #455972 patch)
  -%sparcx %sparc sparc64 sparc64v
  +%sparcx %sparc sparc64 sparc64v sparc64v2
   
   # also for mips
   %mips mips mips2 mips3 mips4 octeon
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org