- added %ifarch for PPC port of PLD :)

[packages/rpm.git] / rpm-installplatform.patch

diff --git a/rpm-installplatform.patch b/rpm-installplatform.patch
index 9ac34c4eae212ae64ec80eb2bafdfaacebdcfc3c..011c42cc1d4f54638473617eb34de6d96c6f4904 100644 (file)
--- a/rpm-installplatform.patch
+++ b/rpm-installplatform.patch
@@ -1,11 +1,11 @@
---- rpm-4.0/installplatform.orig       Wed Sep 13 19:57:58 2000
-+++ rpm-4.0/installplatform    Sun Dec 24 20:57:16 2000
+--- rpm-4.0.1/installplatform.wiget    Wed Jan 17 17:14:16 2001
++++ rpm-4.0.1/installplatform  Wed Jan 31 17:47:58 2001
 @@ -21,11 +21,12 @@
  
  RPM="./rpm --rcfile $TEMPRC"
  
 -arch="`$RPM --eval '%{_arch}'`"
-+CHARCH='s_i.86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_'
++CHARCH='s_i.86_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_'
 +arch="`$RPM --eval '%{_arch}' | sed -e $CHARCH`"
  VENDOR="`$RPM --eval '%{_vendor}'`"
  OS="`$RPM --eval '%{_os}'`"
@@ -24,12 +24,22 @@
  
  for SUBST in $SUBSTS ; do
    ARCH=`echo $arch | sed -e $SUBST`
-@@ -70,7 +70,7 @@
+@@ -86,7 +86,7 @@
  
-   cat $PLATFORM | \
-     sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
+   cat $PLATFORM \
+   | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
 -      -e "s,@RPMRC_ARCH@,$base_arch," \
 +      -e "s,@RPMRC_ARCH@,$arch," \
        -e "s,@LIB@,$LIB," \
        -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
        -e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \
+--- rpm-4.0.2/installplatform.bug      Tue Aug 28 11:40:56 2001
++++ rpm-4.0.2/installplatform  Tue Aug 28 11:41:15 2001
+@@ -90,7 +90,6 @@
+       -e "s,@LIB@,$LIB," \
+       -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
+       -e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \
+-      -e 's,\${,%{_,' \
+       $MULTILIBSED \
+       $VENDORSED \
+   | grep -v '^@' \