rpms/kernel/devel kernel.spec,1.779,1.780

[Kristian Høgsberg (krh)]

Author: krh

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21895

Modified Files:
	kernel.spec 
Log Message:
* Thu Jul 17 2008 Kristian Høgsberg <krh at redhat.com>
- Add conflicts for older libdrm-devel to kernel-headers.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.779
retrieving revision 1.780
diff -u -r1.779 -r1.780
--- kernel.spec	17 Jul 2008 00:56:41 -0000	1.779
+++ kernel.spec	17 Jul 2008 17:10:24 -0000	1.780
@@ -414,6 +414,10 @@
 %define kernel_smp_obsoletes kernel-enterprise < 2.4.10
 %define kernel_PAE_obsoletes kernel-smp < 2.6.17
 
+# We moved the drm include files into kernel-headers, make sure there's
+# a recent enough libdrm-devel on the system that doesn't have those.
+%define kernel_headers_conflicts libdrm-devel < 2.4.0-0.15
+
 #
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
@@ -1776,6 +1780,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
+* Thu Jul 17 2008 Kristian Høgsberg <krh at redhat.com>
+- Add conflicts for older libdrm-devel to kernel-headers.
+
 * Wed Jul 16 2008 Dave Jones <davej at redhat.com>
 - Merge Linux-2.6 up to commit 8a0ca91e1db5de5eb5b18cfa919d52ff8be375af