1 --- rpm-4.5/installplatform.orig 2013-07-17 10:01:04.000000000 +0000
2 +++ rpm-4.5/installplatform 2013-07-17 10:18:26.094178797 +0000
4 sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
5 powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;;
6 s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;;
7 - x86_64|amd64|ia32e) SUBSTS='s,x86_64,x86_64, s,x86_64,ia32e, s,x86_64,amd64,' ;;
8 + x86_64|amd64|ia32e) SUBSTS='s|x86_64|x86_64| s|x86_64|ia32e| s|x86_64|amd64|' ;;
13 [ -d $PPD ] || mkdir $PPD
15 RPMRC_OPTFLAGS="`sed -n 's/^optflags: '$ARCH' //p' $RPMRC`"
16 - RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e 's, ,\ ,g'`"
17 + RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e 's| |\ |g'`"
18 case $RPMRC_OPTFLAGS in
20 *) RPMRC_OPTFLAGS="$RPMRC_OPTFLAGS -g" ;;
24 if [ -n "$MULTILIBNO" ]; then
25 - MULTILIBSED='-e /^@MULTILIB/d -e s,@MULTILIBNO@,'$MULTILIBNO,
26 + MULTILIBSED='-e /^@MULTILIB/d -e s|@MULTILIBNO@|'$MULTILIBNO'|'
28 MULTILIBSED='-e /^@MULTILIBSTART@/,/^@MULTILIBEND@/d'
33 - VENDORSED='-e s,^@yellowdog@,,'
34 + VENDORSED='-e s|^@yellowdog@||'
37 - VENDORSED='-e s,^@tld@,,'
38 + VENDORSED='-e s|^@tld@||'
39 RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e "s/ -g/ /"`"
42 - VENDORSED='-e s,^@mandrake@,,'
43 + VENDORSED='-e s|^@mandrake@||'
44 RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e s/i386/i686/`"
47 - VENDORSED='-e s,^@conectiva@,,'
48 + VENDORSED='-e s|^@conectiva@||'
51 - VENDORSED='-e s,^@redhat@,,'
52 + VENDORSED='-e s|^@redhat@||'
55 - VENDORSED='-e s,^@apple@,,'
56 + VENDORSED='-e s|^@apple@||'
59 - VENDORSED='-e s,^@crux@,,'
60 + VENDORSED='-e s|^@crux@||'
65 - | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
66 - -e "s,@RPMRC_ARCH@,$ARCH," \
67 - -e "s,@RPMRC_GNU@,$RPMRC_GNU," \
68 - -e "s,@LIB@,$LIB," \
69 - -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
70 - -e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \
71 - -e '/\${\w*:-/!s,\${,%{_,' \
72 + | sed -e "s|@RPMRC_OPTFLAGS@|$RPMRC_OPTFLAGS|" \
73 + -e "s|@RPMRC_ARCH@|$ARCH|" \
74 + -e "s|@RPMRC_GNU@|$RPMRC_GNU|" \
75 + -e "s|@LIB@|$LIB|" \
76 + -e "s|@ARCH_INSTALL_POST@|$ARCH_INSTALL_POST|" \
77 + -e "s|@DEFAULTDOCDIR@|$DEFAULTDOCDIR|" \
78 + -e '/\${\w*:-/!s|\${|%{_|' \
87 { cd ${DESTDIR}/${pkglibdir}
88 [ -L noarch-${OS} ] && rm -f noarch-${OS} 2>/dev/null
90 - sed -e "/^%_arch/s,${arch},noarch," ${arch}-${OS}/macros | grep -v '^%optflags' > noarch-${OS}/macros
91 + sed -e "/^%_arch/s|${arch}|noarch|" ${arch}-${OS}/macros | grep -v '^%optflags' > noarch-${OS}/macros
92 # [ -d ${VENDOR} ] || mkdir ${VENDOR}
93 # for i in brp-* find-lang.sh find-provides find-requires perl.prov perl.req
95 -# sed -e "s,/usr/lib/rpm,/usr/lib/rpm/${VENDOR},g" < $i > ${VENDOR}/$i
96 +# sed -e "s|/usr/lib/rpm|/usr/lib/rpm/${VENDOR}|g" < $i > ${VENDOR}/$i
97 # chmod +x ${VENDOR}/$i
99 ## chmod -x ${VENDOR}/perl.req
100 # echo "macrofiles: /usr/lib/rpm/macros:/usr/lib/rpm/${VENDOR}/macros:/etc/rpm/macros.specspo:/etc/rpm/macros.cdb" > ${VENDOR}/rpmrc
101 -# sed -e "s,/usr/lib/rpm,/usr/lib/rpm/${VENDOR},g" < ${arch}-${OS}/macros | grep -v '^%(_arch|optflags)' > ${VENDOR}/macros
102 +# sed -e "s|/usr/lib/rpm|/usr/lib/rpm/${VENDOR}|g" < ${arch}-${OS}/macros | grep -v '^%(_arch|optflags)' > ${VENDOR}/macros