rpms/xorg-x11-drv-intel/devel xorg-x11-drv-intel.spec,1.6,1.7

[Kristian Høgsberg]

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24342

Modified Files:
	xorg-x11-drv-intel.spec 
Log Message:
* Thu Mar  5 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-13
- Add conflicts to make sure we have a new enough kernel that
  drmSetMaster() doesn't deadlock.



Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-intel.spec	4 Mar 2009 22:42:27 -0000	1.6
+++ xorg-x11-drv-intel.spec	5 Mar 2009 14:45:16 -0000	1.7
@@ -8,7 +8,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-intel
 Version:   2.6.0
-Release:   12%{?dist}
+Release:   13%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -33,13 +33,15 @@
 BuildRequires: xorg-x11-server-devel >= 1.4.99.1
 BuildRequires: libXvMC-devel
 BuildRequires: mesa-libGL-devel >= 6.5-9
-BuildRequires: libdrm-devel >= 2.4.3
+BuildRequires: libdrm-devel >= 2.4.5
 BuildRequires: kernel-headers
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg >= 1.4.99.1
 
 Conflicts:  kudzu < 1.2.42-1
+Conflicts:  kernel < 2.6.29-0.207.rc7.fc11
+Conflicts:  kernel-PAE < 2.6.29-0.207.rc7.fc11
 Provides:   %{legacyname} = %{legacyver}
 Obsoletes:  %{legacyname} < %{legacyver}
 
@@ -103,6 +105,10 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Thu Mar  5 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-13
+- Add conflicts to make sure we have a new enough kernel that
+  drmSetMaster() doesn't deadlock.
+
 * Wed Mar  4 2009 Kristian Høgsberg <krh at redhat.com> - 2.6.0-12
 - Update to new git snapshot: re-enables multiple X servers, fixes
   leak on vt switch for 965 type hardware, fold dpms patch into git