rpms/xorg-x11-server/F-11 xorg-x11-server.spec,1.438,1.439

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31083

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Wed Apr 22 2009 Adam Jackson <ajax at redhat.com> 1.6.1-7
- Conflict with too-old versions of xorg-x11-drivers. (#497144)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- xorg-x11-server.spec	17 Apr 2009 19:06:22 -0000	1.438
+++ xorg-x11-server.spec	22 Apr 2009 14:51:25 -0000	1.439
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   6%{?dist}
+Release:   7%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -208,6 +208,8 @@
 Obsoletes: xorg-x11-drv-tek4957 <= 1.2.0-1.fc9
 Obsoletes: xorg-x11-drv-ur98 <= 1.1.0-5.fc9
 Obsoletes: xorg-x11-drv-wiimote <= 0.0.1-1.fc9
+# old driver metapackages would Require the above, so force them out
+Conflicts: xorg-x11-drivers < 7.3-11.fc11
 # Force sufficiently new libpciaccess
 Conflicts: libpciaccess < 0.10.3-5
 
@@ -540,6 +542,9 @@
 
 
 %changelog
+* Wed Apr 22 2009 Adam Jackson <ajax at redhat.com> 1.6.1-7
+- Conflict with too-old versions of xorg-x11-drivers. (#497144)
+
 * Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 1.6.1-6
 - xserver-1.6.1-randr-gamma.patch: Silence debugging messages.