one s/// removed (break %%configure and %%configure2_13 macros)

Changed files:
    rpm-installplatform.patch -> 1.3

diff --git a/rpm-installplatform.patch b/rpm-installplatform.patch
index c1fb0cd542104ae5a2ebe75f49733dcebfe9ef18..fc02dfd1f0953c125929cd7bb1a2cf20e4530bf6 100644 (file)
--- a/rpm-installplatform.patch
+++ b/rpm-installplatform.patch
@@ -1,35 +1,10 @@
---- 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_'
-+arch="`$RPM --eval '%{_arch}' | sed -e $CHARCH`"
- VENDOR="`$RPM --eval '%{_vendor}'`"
- OS="`$RPM --eval '%{_os}'`"
--target_platform="`$RPM --eval '%{_target_platform}'`"
--target="`$RPM --eval '%{_target}'`"
-+target_platform="`$RPM --eval '%{_target_platform}' | sed -e $CHARCH`"
-+target="`$RPM --eval '%{_target}' | sed -e $CHARCH`"
- 
- rm -f ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
- ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
-@@ -38,7 +39,6 @@
-   sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
-   *) SUBSTS=y___ ;;
- esac
--base_arch=`echo $arch | sed -e 's_i?86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_'`
- 
- for SUBST in $SUBSTS ; do
-   ARCH=`echo $arch | sed -e $SUBST`
-@@ -86,7 +86,7 @@
- 
-   cat $PLATFORM \
-   | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
--      -e "s,@RPMRC_ARCH@,$base_arch," \
-+      -e "s,@RPMRC_ARCH@,$arch," \
+--- 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 '^@' \