From e8942010aafba759c6cb50cbb930174248d68f3e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 19 Mar 2007 18:46:18 +0000 Subject: [PATCH] auto-import xorg-x11-server-1.2.99.902-1.fc7 on branch devel from xorg-x11-server-1.2.99.902-1.fc7.src.rpm --- .cvsignore | 2 +- sources | 2 +- xorg-x11-server-1.2.99-unbreak-domain.patch | 17 ----------------- xorg-x11-server.spec | 7 +++++-- 4 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 xorg-x11-server-1.2.99-unbreak-domain.patch diff --git a/.cvsignore b/.cvsignore index 4450802..979594a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-1.2.99.901.tar.bz2 +xorg-server-1.2.99.902.tar.bz2 diff --git a/sources b/sources index f9025d2..6a8a63c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fa14761413ffaf36c0bf591cf419709 xorg-server-1.2.99.901.tar.bz2 +e3013c42e2a450024983c78f5b0b4474 xorg-server-1.2.99.902.tar.bz2 diff --git a/xorg-x11-server-1.2.99-unbreak-domain.patch b/xorg-x11-server-1.2.99-unbreak-domain.patch deleted file mode 100644 index b48f299..0000000 --- a/xorg-x11-server-1.2.99-unbreak-domain.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- xorg-server-1.2.99.901/hw/xfree86/os-support/bus/linuxPci.c~ 2006-11-16 18:01:25.000000000 +0000 -+++ xorg-server-1.2.99.901/hw/xfree86/os-support/bus/linuxPci.c 2007-03-07 15:44:10.000000000 +0000 -@@ -158,7 +158,13 @@ linuxPciOpenFile(PCITAG tag, Bool write) - if (stat("/sys/bus/pci",&ignored) < 0) - is26 = 0; - else -- is26 = 1; -+ /* If we don't find the incompatible IA64 "domain support" in -+ /proc/bus/pci then we don't know domain numbers. This means -+ we ought to use /proc/bus/pci for accessing devices, instead -+ of /sys/bus/pci. So in that case we just pretend it's a 2.4 -+ kernel, and hope the kernel has set up disjoint bus numbers -+ for us, like it always used to. */ -+ is26 = domain_support; - } - - if (!domain_support && domain > 0) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 7ba47a9..4626b26 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -8,8 +8,8 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.2.99.901 -Release: 2%{?dist} +Version: 1.2.99.902 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -561,6 +561,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Mar 19 2007 Adam Jackson 1.2.99.902-1 +- xserver 1.3 RC2. + * Tue Mar 13 2007 Adam Jackson 1.2.99.901-2 - xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual mess. (#231425)