From 137e2891f852d6b3537ecbca3ef2c6a86315bf10 Mon Sep 17 00:00:00 2001 From: sparky Date: Sat, 11 Feb 2006 21:30:37 +0000 Subject: [PATCH] - more --host=ppc7450-pld-linux-gnu must be killed Changed files: rpm.spec -> 1.728 --- rpm.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rpm.spec b/rpm.spec index a827529..d5c2553 100644 --- a/rpm.spec +++ b/rpm.spec @@ -29,7 +29,7 @@ Summary(uk): 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 @@ -727,7 +727,7 @@ cd .. %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 @@ -775,6 +775,11 @@ install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/b 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 -- 2.44.0