From 70fbb3a98ff84e438f3309378fdb3132d70077b6 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Feb 11 2008 22:44:58 +0000
Subject: * Mon Feb 11 2008 Adam Jackson <ajax@redhat.com> 1.4.99.1-0.20

- Conflict against insufficiently new libpciaccess. (#390751)

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 8d54389..ba1cbc6 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -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 @@ Requires: xorg-x11-server-common >= %{version}-%{release}
 # 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 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 11 2008 Adam Jackson <ajax@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