SPECS: rpm.spec - more --host=ppc7450-pld-linux-gnu must be killed

sparky sparky at pld-linux.org
Sat Feb 11 22:30:42 CET 2006


Author: sparky                       Date: Sat Feb 11 21:30:42 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more --host=ppc7450-pld-linux-gnu must be killed

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

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.727 SPECS/rpm.spec:1.728
--- SPECS/rpm.spec:1.727	Sat Feb 11 21:38:14 2006
+++ SPECS/rpm.spec	Sat Feb 11 22:30:37 2006
@@ -30,7 +30,7 @@
 Name:		rpm
 %define	sover	4.4
 Version:	4.4.4
-Release:	0.3
+Release:	0.4
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -728,7 +728,7 @@
 %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
+	-e "s|@host_cpu@|ppc|" 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
@@ -776,6 +776,11 @@
 	pylibdir=%{py_libdir} \
 	pkgbindir="%{_bindir}"
 
+%ifarch %{ppc}
+sed -e '/_target_platform/s/[%]{_target_cpu}/ppc/' \
+	-i $RPM_BUILD_ROOT%{_rpmlibdir}/ppc74[05]0-linux/macros
+%endif
+
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/vpkg-provides*
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{prov,req}.pl
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/find-{provides,requires}.perl
@@ -1157,6 +1162,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.728  2006/02/11 21:30:37  sparky
+- more --host=ppc7450-pld-linux-gnu must be killed
+
 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
 
================================================================

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



More information about the pld-cvs-commit mailing list