From 96ba0c8934cda5bc70df1d7b6ba59e228481ea3b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 2 Jan 2006 17:09:28 +0000
Subject: [PATCH] - X11-OpenGL-libGL obsoletes XFree86-Mesa-libGL (provides
 same library) - sort obsoletes

Changed files:
    X11.spec -> 1.178
---
 X11.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/X11.spec b/X11.spec
index 4bd46b6..f1a144d 100644
--- a/X11.spec
+++ b/X11.spec
@@ -393,6 +393,7 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Provides:	XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
 Obsoletes:	X11-driver-firegl
 Obsoletes:	X11-driver-nvidia
+Obsoletes:	XFree86-Mesa-libGL
 Obsoletes:	XFree86-OpenGL-libGL
 Obsoletes:	XFree86-driver-firegl
 Obsoletes:	XFree86-driver-nvidia
@@ -558,7 +559,6 @@ Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	X11-fonts-base
 Requires:	pam >= 0.79.0
 Provides:	XFree86-Xserver = %{epoch}:%{version}-%{release}
-Obsoletes:	XFree86-Xserver
 Obsoletes:	XFree86-Mono
 Obsoletes:	XFree86-SVGA
 Obsoletes:	XFree86-VGA16
@@ -566,9 +566,13 @@ Obsoletes:	XFree86-VGA16
 Obsoletes:	XFree86-Sun
 Obsoletes:	XFree86-Sun24
 # still not supported in 4.2.0:
-#Obsoletes:	XFree86-Mach8 XFree86-8514 XFree86-AGX XFree86-P9000
+#Obsoletes:	XFree86-8514
+#Obsoletes:	XFree86-AGX
+#Obsoletes:	XFree86-Mach8
+#Obsoletes:	XFree86-P9000
 # (and many drivers from XF86_SVGA server... and some from others)
 Obsoletes:	XFree86-XF86Setup
+Obsoletes:	XFree86-Xserver
 Obsoletes:	Xconfigurator
 
 %description Xserver
-- 
2.44.0