From a366c664a1d7d086ad7adaa362a77cf017159676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 28 Jul 2006 20:41:08 +0000 Subject: [PATCH] =?UTF-8?q?*=20Fri=20Jul=2028=202006=20Kristian=20H=C3=B8g?= =?UTF-8?q?sberg=20=20-=201.1.1-13.fc5.aiglx=20-=20Add=20c?= =?UTF-8?q?onflicts=20for=20ABI=20incompatible=20version=20of=20xorg-x11-d?= =?UTF-8?q?rv-i810=20and=20=20=20xorg-x11-drv-ati.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xorg-x11-server.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 425fbdd..b3323be 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -8,7 +8,7 @@ Version: 1.1.1 # upgrades to officially released distribution releases, if the package # Version field above is not changing, append and/or bump a digit /after/ # the dist tag. ie: 25%{dist}.0 -> 25%{dist}.1 ... -Release: 13%{?dist} +Release: 13.fc5.aiglx URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -151,6 +151,10 @@ BuildRequires: libdrm-devel >= 2.0-1 BuildRequires: libselinux-devel +# Make sure we pull ABI compatible drivers. +Conflicts: xorg-x11-drv-ati < 6.6.1 +Conflicts: xorg-x11-drv-i810 < 1.6.0 + %description X.Org X11 X server @@ -672,6 +676,10 @@ rm -rf $RPM_BUILD_ROOT # ------------------------------------------------------------------- %changelog +* Fri Jul 28 2006 Kristian Høgsberg - 1.1.1-13.fc5.aiglx +- Add conflicts for ABI incompatible version of xorg-x11-drv-i810 and + xorg-x11-drv-ati. + * Fri Jul 28 2006 Adam Jackson 1.1.1-13.fc6 - Comment out the 848x480 modes from the extramodes patch. Any panel that wants it should be doing EDID injection by now, and it screws up