rpms/xorg-x11-server/devel xorg-x11-server.spec,1.291,1.292

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1060

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Feb 11 2008 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.20
- Conflict against insufficiently new libpciaccess. (#390751)



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- xorg-x11-server.spec	29 Jan 2008 09:45:25 -0000	1.291
+++ xorg-x11-server.spec	11 Feb 2008 22:44:58 -0000	1.292
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.1
-Release:   0.19.%{?gitdate}%{?dist}
+Release:   0.20.%{?gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -175,6 +175,8 @@
 # These drivers were dropped in F7 for being broken, so uninstall them.
 Obsoletes: xorg-x11-drv-elo2300 <= 1.1.0-2.fc7
 Obsoletes: xorg-x11-drv-joystick <= 1.1.0-2.fc7
+# Force sufficiently new libpciaccess
+Conflicts: libpciaccess < 0.9.1-2
 
 %description Xorg
 X.org X11 is an open source implementation of the X Window System.  It
@@ -515,6 +517,9 @@
 
 
 %changelog
+* Mon Feb 11 2008 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.20
+- Conflict against insufficiently new libpciaccess. (#390751)
+
 * Tue Jan 29 2008 Adam Tkac <atkac redhat com> 1.4.99.1-0.19
 - added dix/protocol.txt to source subpackage