SPECS: rpm.spec - added morearchs, not very clean as _host must be...

[sparky]

Author: sparky                       Date: Sat Feb 11 20:38:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added morearchs, not very clean as _host must be ppc-pld-linux-gnu for those

---- Files affected:
SPECS:
   rpm.spec (1.726 -> 1.727) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.726 SPECS/rpm.spec:1.727
--- SPECS/rpm.spec:1.726	Fri Jan 20 22:43:30 2006
+++ SPECS/rpm.spec	Sat Feb 11 21:38:14 2006
@@ -107,6 +107,7 @@
 Patch49:	%{name}-p4.patch
 Patch50:	%{name}-macros.patch
 Patch51:	%{name}-cleanlibdirs.patch
+Patch52:	%{name}-morearchs.patch
 URL:		http://wraptastic.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -162,6 +163,7 @@
 # don't require very fresh rpm.macros to build
 %define		__gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,}
 %define		ix86	i386 i486 i586 i686 athlon pentium3 pentium4
+%define		ppc	ppc ppc7400 ppc7450
 %define		x8664	amd64 ia32e x86_64
 
 # stabilize new build environment
@@ -680,6 +682,7 @@
 %patch49 -p1
 %patch50 -p1
 %patch51 -p1
+%patch52 -p1
 
 cd scripts
 mv -f perl.req perl.req.in
@@ -722,8 +725,14 @@
 
 # config.guess doesn't handle athlon, so we have to change it by hand.
 # rpm checks for CPU type at runtime, but it looks better
+%ifarch %{ppc}
+TARG=$( echo %{_target_cpu} | sed 's/ppc//' )
+sed -e "s|@host@|ppc-%{_target_vendor}-linux-gnu|" \
+	-e "s|@host_cpu@|%{_target_cpu}|" macros.in > macros.tmp
+%else
 sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' \
 	-e 's|@host_cpu@|%{_target_cpu}|' macros.in > macros.tmp
+%endif
 mv -f macros.tmp macros.in
 
 CPPFLAGS="-Dglob=rpm_glob -Dglobfree=rpm_globfree"; export CPPFLAGS
@@ -1070,7 +1079,7 @@
 %ifarch mips mipsel mips64 mips64el
 %{_rpmlibdir}/mips*
 %endif
-%ifarch ppc
+%ifarch %{ppc}
 %{_rpmlibdir}/ppc*
 %endif
 %ifarch sparc sparc64
@@ -1148,6 +1157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.727  2006/02/11 20:38:14  sparky
+- added morearchs, not very clean as _host must be ppc-pld-linux-gnu for those
+
 Revision 1.726  2006/01/20 21:43:30  glen
 - banner.sh no longer needs sed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.726&r2=1.727&f=u