1 diff -ur rpm-4.0.2/installplatform rpm-4.0.2-new/installplatform
2 --- rpm-4.0.2/installplatform Thu Jan 24 09:50:29 2002
3 +++ rpm-4.0.2-new/installplatform Thu Jan 24 11:25:42 2002
6 RPM="./rpm --rcfile $TEMPRC"
8 -CHARCH='s_i.86_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_'
9 +CHARCH='s_i.86_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_'
10 arch="`$RPM --eval '%{_arch}' | sed -e $CHARCH`"
11 VENDOR="`$RPM --eval '%{_vendor}'`"
12 OS="`$RPM --eval '%{_os}'`"
14 ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${OS}
17 - i[3456]86) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_' ;;
18 + i[3456]86) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;;
19 alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;;
20 sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
22 diff -ur rpm-4.0.2/macros.in rpm-4.0.2-new/macros.in
23 --- rpm-4.0.2/macros.in Thu Jan 24 09:50:29 2002
24 +++ rpm-4.0.2-new/macros.in Thu Jan 24 11:26:29 2002
26 # rpm can use regular expressions against target platforms in macro
27 # conditionals. This change will be introduced after rpm-3.0.4).
29 -%ix86 i386 i486 i586 i686 i786 i886 i986
30 +%ix86 i386 i486 i586 i686 i786 i886 i986 athlon
32 #------------------------------------------------------------------------
33 # Use in %install to generate locale specific file lists. For example,