rpms/kernel/F-9 kernel.spec,1.784,1.785

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21778

Modified Files:
	kernel.spec 
Log Message:
Copy dwmw2's build fixes from rawhide


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.784
retrieving revision 1.785
diff -u -r1.784 -r1.785
--- kernel.spec	8 Oct 2008 00:20:53 -0000	1.784
+++ kernel.spec	8 Oct 2008 22:26:12 -0000	1.785
@@ -1481,6 +1481,9 @@
     fi
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
+%ifarch ppc
+    cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+%endif
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cd include
     cp -a acpi config keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
@@ -1498,6 +1501,9 @@
     cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
 %endif
 
+    if [ -d arch/%{_arch}/include ]; then
+      cp -a --parents arch/%{_arch}/include  $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+    fi
     # Make sure the Makefile and version.h have a matching timestamp so that
     # external modules can be built
     touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h
@@ -1886,6 +1892,11 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Wed Oct 08 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.6-58.rc1
+- Copy dwmw2's build fixes from rawhide:
+    Include arch/$ARCH/include/ directories in kernel-devel (F10#465486)
+    Include arch/powerpc/lib/crtsavres.[So] too (#464613)
+
 * Tue Oct  7 2008 Roland McGrath <roland at redhat.com> 2.6.26.6-57.rc1
 - Fix build ID fiddling magic. (#465873)