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: Revision Changes 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 -0000 1.3296.2.247 +++ rpm/CHANGES 29 Jul 2011 04:27:49 -0000 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 -0000 1.4.2.6 +++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:27:50 -0000 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 Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org