--- rpm.spec.ORIG	2008-04-18 10:20:57.000000000 -0600
+++ rpm.spec	2008-05-21 20:58:59.000000000 -0600
@@ -24,6 +24,10 @@
 Patch12: rpm-4.4.2.3-no-order-rescan-limit.patch
 Patch13: rpm-4.4.2.3-fix-find-requires.patch
 Patch50: rpm-4.4.2.3-rc1-sparc-mcpu.patch
+Patch96: rpm-4.4.2.3-64bit.patch
+Patch97: rpm-4.4.2.3-intel.patch
+Patch98: rpm-4.4.2.3-warning.patch
+Patch99: rpm-4.4.2.3-doxygen.patch
 
 # XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
 # and several different components with their own licenses included...
@@ -149,6 +153,10 @@
 %patch12 -p1 -b .no-order-limit
 %patch13 -p1 -b .requires
 %patch50 -p1 -b .sparc-mcpu
+%patch96 -p1 -b .64bit
+%patch97 -p1 -b .intel
+%patch98 -p1 -b .warning
+%patch99 -p1 -b .doxygen
 
 # force external popt
 rm -rf popt/
@@ -285,11 +293,13 @@
 %{rpmhome}/rpmpopt*
 %{rpmhome}/rpmrc
 
-%ifarch i386 i486 i586 i686 athlon geode pentium3 pentium4 x86_64
+%ifarch i386 i486 i586 i686 athlon geode pentium3 pentium4 pentiumm prescott nocona x86_64 ia32e core2
 %{rpmhome}/i[3456]86*
 %{rpmhome}/athlon*
 %{rpmhome}/geode*
 %{rpmhome}/pentium*
+%{rpmhome}/prescott*
+%{rpmhome}/nocona*
 %endif
 %ifarch alpha alphaev5 alphaev56 alphapca56 alphaev6 alphaev67
 %{rpmhome}/alpha*
@@ -312,10 +322,11 @@
 %ifarch mips mipsel
 %{rpmhome}/mips*
 %endif
-%ifarch x86_64
+%ifarch x86_64 ia32e core2
 %{rpmhome}/x86_64*
 %{rpmhome}/amd64*
 %{rpmhome}/ia32e*
+%{rpmhome}/core2*
 %endif
 %{rpmhome}/noarch*