Merge fixup

Makefile

@@ -1,11 +1,6 @@
 # Makefile for source rpm: kernel
 SPECFILE := kernel.spec
 
-# use noarch for make prep instead of the current CPU
-# noarch creates and checks all config files not just the current one,
-# in addition "i386" isn't a valid kernel target
-PREPARCH  = noarch
-
 # we only check the .sign signatures
 UPSTREAM_CHECKS = sign
 
@@ -18,7 +13,7 @@ help:
 include Makefile.config
 
 prep:
-	fedpkg -v prep --arch=$(PREPARCH)
+	fedpkg -v prep
 
 noarch:
 	fedpkg -v local --arch=noarch

kernel.spec

@@ -1458,7 +1458,7 @@ rm -f kernel-%{version}-*debug.config
 %endif
 
 # now run oldconfig over all the config files
-for i in kernel-*-$(uname -p)*.config
+for i in kernel-*-%{_target_cpu}*.config
 do
   mv $i .config
   Arch=`head -1 .config | cut -b 3-`
@@ -2289,6 +2289,9 @@ fi
 * Fri Mar 30 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git5.1
 - Linux v3.3-9295-gf52b69f
 
+* Fri Mar 30 2012 Dave Jones <davej@redhat.com>
+- Change config parsing to use {_target_cpu} (From Niels de Vos)
+
 * Thu Mar 29 2012 Justin M. Forbes <jforbes@redhat.com> - 3.4.0-0.rc0.git4.1
 - Linux v3.3-8839-gb5174fa