rpms/kernel/F-9 kernel.spec,1.832,1.833

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Log Message:
Remove DRM headers from kernel-headers: they conflict with F9 drm-devel.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -r1.832 -r1.833
--- kernel.spec	30 Oct 2008 23:10:29 -0000	1.832
+++ kernel.spec	31 Oct 2008 17:07:17 -0000	1.833
@@ -1692,6 +1692,8 @@
 
 # glibc provides scsi headers for itself, for now
 rm -rf $RPM_BUILD_ROOT/usr/include/scsi
+# drm-devel in F9 provides its own headers
+rm -rf $RPM_BUILD_ROOT/usr/include/drm
 rm -f $RPM_BUILD_ROOT/usr/include/asm*/atomic.h
 rm -f $RPM_BUILD_ROOT/usr/include/asm*/io.h
 rm -f $RPM_BUILD_ROOT/usr/include/asm*/irq.h
@@ -1899,6 +1901,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Oct 31 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.4-20
+- Remove DRM headers from kernel-headers: they conflict with F9 drm-devel.
+
 * Thu Oct 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.4-17
 - Three wireless fixes from F10.