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:
Revision Changes 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 -0000 1.3296.2.246
+++ rpm/CHANGES 29 Jul 2011 04:16:06 -0000 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 -0000 1.4.2.5
+++ rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:16:06 -0000 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 Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
