---- 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 @@
+--- rpm-4.0.4/installplatform.wiget Tue Feb 12 21:59:53 2002
++++ rpm-4.0.4/installplatform Tue Feb 12 22:31:13 2002
+@@ -21,12 +21,13 @@
+
+ RPM="./rpm --rcfile $TEMPRC"
+
+-arch="`$RPM --eval '%{_arch}'`"
++canonarch_sed='s_i.86_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_\(powerpc\|ppc\)[^-]*_ppc_'
++arch="`$RPM --eval '%{_arch}'|sed -e "$canonarch_sed"`"
+ VENDOR="`$RPM --eval '%{_vendor}'`"
+ OS="`$RPM --eval '%{_os}'`"
+ RPMRC_GNU="`$RPM --eval '%{_gnu}'`"
+-target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'`"
+-target="`$RPM --eval '%{_target}'`"
++target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'|sed -e "$canonarch_sed"`"
++target="`$RPM --eval '%{_target}'|sed -e "$canonarch_sed"`"
+
+ rm -f ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
+ ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
+@@ -34,13 +35,12 @@
+ ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${OS}
+
+ case "$arch" in
+- i[3456]86) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;;
++ i[3456]86|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;;
+ alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;;
+ sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
+ powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6]\|$\)_ppc64\1_' ;;
+ *) SUBSTS=y___ ;;
+ esac
+-base_arch=`echo $arch | sed -e 's_i?86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_;s_\(powerpc\|ppc\).*_ppc_'`
+
+ for SUBST in $SUBSTS ; do
+ ARCH=`echo $arch | sed -e $SUBST`
+@@ -76,6 +76,7 @@
+ case $VENDOR in
+ pld)
+ VENDORSED='-e s,^@pld@,,'
++ RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e "s/ -g/ /"`"
+ ;;
+ mandrake)
+ VENDORSED='-e s,^@mandrake@,,'
+@@ -91,12 +92,12 @@
+
+ cat $PLATFORM \
+ | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
+- -e "s,@RPMRC_ARCH@,$base_arch," \
++ -e "s,@RPMRC_ARCH@,$ARCH," \
+ -e "s,@RPMRC_GNU@,$RPMRC_GNU," \
-e "s,@LIB@,$LIB," \
-e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
-e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \
-- -e 's,\${,%{_,' \
+- -e '/FLAGS:-/!s,\${,%{_,' \
++ -e '/\${\w*:-/!s,\${,%{_,' \
$MULTILIBSED \
$VENDORSED \
| grep -v '^@' \
+