rpms/kernel/devel kernel.spec,1.1156,1.1157

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16344

Modified Files:
	kernel.spec 
Log Message:
* Mon Dec 08 2008 Kyle McMartin <kyle at redhat.com>
- properly fix headers in kernel-devel if headers are in arch/$arch/include,
  sadly was not able to kill off %hdrarch since $Arch is undefined at the
  time we need it for headers install.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1156
retrieving revision 1.1157
diff -u -r1.1156 -r1.1157
--- kernel.spec	8 Dec 2008 18:59:38 -0000	1.1156
+++ kernel.spec	9 Dec 2008 00:50:07 -0000	1.1157
@@ -277,10 +277,10 @@
 # Per-arch tweaks
 
 %ifarch %{all_x86}
+%define asmarch x86
+%define hdrarch i386
 %define all_arch_configs kernel-%{version}-i?86*.config
 %define image_install_path boot
-%define hdrarch i386
-%define asmarch x86
 %define kernel_image arch/x86/boot/bzImage
 %endif
 
@@ -292,20 +292,22 @@
 %endif
 
 %ifarch ppc64
+%define asmarch powerpc
+%define hdrarch powerpc
 %define all_arch_configs kernel-%{version}-ppc64*.config
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux
 %define kernel_image_elf 1
-%define hdrarch powerpc
 %endif
 
 %ifarch s390x
+%define asmarch s390
+%define hdrarch s390
 %define all_arch_configs kernel-%{version}-s390x.config
 %define image_install_path boot
 %define make_target image
 %define kernel_image arch/s390/boot/image
-%define hdrarch s390
 %endif
 
 %ifarch sparc
@@ -313,6 +315,7 @@
 %endif
 
 %ifarch sparc64
+%define asmarch sparc
 %define all_arch_configs kernel-%{version}-sparc64*.config
 %define make_target image
 %define kernel_image arch/sparc64/boot/image
@@ -320,12 +323,13 @@
 %endif
 
 %ifarch ppc
+%define asmarch powerpc
+%define hdrarch powerpc
 %define all_arch_configs kernel-%{version}-ppc{-,.}*config
 %define image_install_path boot
 %define make_target vmlinux
 %define kernel_image vmlinux
 %define kernel_image_elf 1
-%define hdrarch powerpc
 %endif
 
 %ifarch ia64
@@ -1374,8 +1378,8 @@
 %ifarch ppc
     cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
 %endif
-    if [ -d arch/$Arch/include ]; then
-      cp -a --parents arch/$Arch/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+    if [ -d arch/%{asmarch}/include ]; then
+      cp -a --parents arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
     fi
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cd include
@@ -1763,6 +1767,11 @@
 
 %changelog
 * Mon Dec 08 2008 Kyle McMartin <kyle at redhat.com>
+- properly fix headers in kernel-devel if headers are in arch/$arch/include,
+  sadly was not able to kill off %hdrarch since $Arch is undefined at the
+  time we need it for headers install.
+
+* Mon Dec 08 2008 Kyle McMartin <kyle at redhat.com>
 - merging, merging, merging...
 
 * Mon Dec 08 2008 Dave Jones <davej at redhat.com>