--- rpm/installplatform.org	2006-10-17 22:52:24.253936250 +0200
+++ rpm/installplatform	2006-10-17 22:52:29.542266750 +0200
@@ -35,7 +35,6 @@
   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\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;;
   s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;;
-  x86_64|amd64|ia32e) SUBSTS='s,x86_64,ia32e, s,x86_64,amd64,' ;;
   *) SUBSTS=y___ ;;
 esac
 
--- rpm/lib/rpmds.c.org	2007-05-19 20:54:35.782330814 +0200
+++ rpm/lib/rpmds.c	2007-05-19 20:55:12.519874545 +0200
@@ -2703,7 +2703,7 @@
 	/*@modifies t @*/
 {
     *t = '\0';
-#if !defined(__alpha__) && ( !defined(__sun) && !defined(__unix) )
+#if !defined(__alpha__) && !defined(__sun)
     if (isElf64) {
 	if (s[strlen(s)-1] != ')')
 	(void) stpcpy( stpcpy(t, s), "()(64bit)");