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