- added %ifarch for PPC port of PLD :)

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

diff --git a/rpm-installplatform.patch b/rpm-installplatform.patch
index c1fb0cd542104ae5a2ebe75f49733dcebfe9ef18..011c42cc1d4f54638473617eb34de6d96c6f4904 100644 (file)
--- a/rpm-installplatform.patch
+++ b/rpm-installplatform.patch
@@ -5,7 +5,7 @@
  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}'`"
@@ -33,3 +33,13 @@
        -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 '^@' \