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: Revision Changes 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 -0000 1.3662 +++ rpm/CHANGES 28 Jul 2011 07:50:39 -0000 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 -0000 1.8 +++ rpm/macros/macros.rpmbuild.in 28 Jul 2011 07:50:40 -0000 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 -%arm arm armv3 armv3l armv3b armv4 armv4l armv4b armv5 armv5l armv5b armv5te armv5tel armv5teb xscale armv6 armv6l +%arm arm 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 Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org