RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 11-May-2011 19:07:19
Branch: HEAD Handle: 2011051117071900
Modified files:
rpm CHANGES rpm.spec.in
Log:
try to fix the %install phase of rpm.spec for multiple architecture
Summary:
Revision Changes Path
1.3636 +1 -0 rpm/CHANGES
2.459 +49 -21 rpm/rpm.spec.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3635 -r1.3636 CHANGES
--- rpm/CHANGES 11 May 2011 09:18:19 -0000 1.3635
+++ rpm/CHANGES 11 May 2011 17:07:19 -0000 1.3636
@@ -1,4 +1,5 @@
5.4.0 -> 5.4.1:
+ - devzero2000: try to fix the %install phase of rpm.spec for multiple
architecture
- devzero2000: document --whatneeds and --needswhat
(ref. https://bugzilla.redhat.com/show_bug.cgi?id=142651)
- proyvind: fix an extremely subtle, corner-case memleak in
parsePreamble.c
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpm.spec.in
============================================================================
$ cvs diff -u -r2.458 -r2.459 rpm.spec.in
--- rpm/rpm.spec.in 2 Nov 2010 16:55:54 -0000 2.458
+++ rpm/rpm.spec.in 11 May 2011 17:07:19 -0000 2.459
@@ -301,27 +301,54 @@
( cd $RPM_BUILD_ROOT/%{_rpmhome}
tar xzf %{SOURCE1}
- # XXX assume ix86 platforms for the moment
- rm -rf ./alpha-linux
- rm -rf ./alphaev5-linux
- rm -rf ./alphaev56-linux
- rm -rf ./alphaev6-linux
- rm -rf ./alphaev67-linux
- rm -rf ./alphapca56-linux
- rm -rf ./amd64-linux
- rm -rf ./ia32e-linux
- rm -rf ./ia64-linux
- rm -rf ./ppc-linux
- rm -rf ./ppc64-linux
- rm -rf ./ppc64iseries-linux
- rm -rf ./ppc64pseries-linux
- rm -rf ./ppciseries-linux
- rm -rf ./ppcpseries-linux
- rm -rf ./s390-linux
- rm -rf ./s390x-linux
- rm -rf ./sparc-linux
- rm -rf ./sparc64-linux
- rm -rf ./sparcv9-linux
+ # XXX RPMARCHCANON contain only i386 for Intel Arch as defined in
configure.ac
+ # so expand here
+ RPMARCHCANON=@RPMARCHCANON@
+ [ $RPMARCHCANON = i386 ] && IX86="i386 i486 x86_64 i586 i686"
+ CPU_OS_MACRO_ARCH=$(cat<<EOF
+./i486-linux
+./ia64-linux
+./mipsel-linux
+./x86_64-linux
+./amd64-linux
+./athlon-linux
+./i386-linux
+./i586-linux
+./i686-linux
+./ia32e-linux
+./k6-linux
+./mips-linux
+./pentium3-linux
+./pentium4-linux
+./sparcv9-linux
+./noarch-linux
+./alpha-linux
+./alphaev5-linux
+./alphaev56-linux
+./alphaev6-linux
+./alphaev67-linux
+./alphapca56-linux
+./ppc-linux
+./ppc64-linux
+./ppc64iseries-linux
+./ppc64pseries-linux
+./ppciseries-linux
+./ppcpseries-linux
+./s390-linux
+./s390x-linux
+./sparc-linux
+./sparc64-linux
+EOF
+)
+ for _archname in ${CPU_OS_MACRO_ARCH} ${IX86}
+ do
+ case "${_archname}" in
+ ${RPMARCHCANON}* ) continue;;
+ ${IX86}* ) continue;;
+ * ) rm -f "${_archname}";;
+ esac
+ done
+
)
%find_lang rpm
@@ -600,6 +627,7 @@
%rpmattr %{_rpmhome}/macros.d/java
%rpmattr %{_rpmhome}/macros.d/libtool
%rpmattr %{_rpmhome}/macros.d/mandriva
+%rpmattr %{_rpmhome}/macros.d/openmamba
%rpmattr %{_rpmhome}/macros.d/mono
%rpmattr %{_rpmhome}/macros.d/perl
%rpmattr %{_rpmhome}/macros.d/php
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
