rpms/kernel/FC-4 kernel-2.6.spec,1.1492,1.1493

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16319

Modified Files:
	kernel-2.6.spec 
Log Message:
Fix headers in kernel-devel package


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1492
retrieving revision 1.1493
diff -u -r1.1492 -r1.1493
--- kernel-2.6.spec	5 Nov 2005 18:58:17 -0000	1.1492
+++ kernel-2.6.spec	9 Nov 2005 01:05:45 -0000	1.1493
@@ -924,7 +924,7 @@
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     (cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source)
     # first copy everything
-    cp --parents `find  -type f -name Makefile -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build 
+    cp --parents `find  -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build 
     cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     # then drop all but the needed Makefiles/Kconfig files
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation
@@ -933,24 +933,34 @@
     cp arch/%{_arch}/kernel/asm-offsets.s $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/kernel || :
     cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
-	if [ -d arch/%{_arch}/scripts ]; then
+    if [ -d arch/%{_arch}/scripts ]; then
       cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
-	fi
-	if [ -f arch/%{_arch}/*lds ]; then
+    fi
+    if [ -f arch/%{_arch}/*lds ]; then
       cp -a arch/%{_arch}/*lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/ || :
-	fi
+    fi
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+    cp -a drivers/media/dvb/frontends/*.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/dvb/frontends
+    cp -a drivers/media/dvb/dvb-core/*.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/dvb/dvb-core
     cd include
     cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
 %if %{buildxen}
     cp -a asm-xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
 %endif
     cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-	if [ "$Arch" = "x86_64" ]; then
-		cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-	fi
+    if [ "$Arch" = "x86_64" ]; then
+      cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+    fi
+    if [ "$Arch" = "ppc64" ]; then
+      cp -a asm-ppc $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+    fi
+    if [ "$Arch" = "ppc" -o "$Arch" = "ppc64" ]; then
+      cp -a asm-powerpc $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+      mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include
+      ln -sf ../../../include/asm-powerpc $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include/asm
+    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
@@ -1226,6 +1236,10 @@
 %endif
 
 %changelog
+* Wed Nov  9 2005 David Woodhouse <dwmw2 at redhat.com>
+- Fix kernel-devel headers on PPC
+- Include DVB headers
+
 * Sat Nov  5 2005 Dave Jones <davej at redhat.com>
 - Fix FPU corruption on return from S3. (#140257)
 - Fix up DMI usage in i8k driver.