SPECS: X11.spec - X11-OpenGL-libGL obsoletes XFree86-Mesa-libGL (p...

[glen]

Author: glen                         Date: Mon Jan  2 17:09:34 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- X11-OpenGL-libGL obsoletes XFree86-Mesa-libGL (provides same library)
- sort obsoletes

---- Files affected:
SPECS:
   X11.spec (1.177 -> 1.178) 

---- Diffs:

================================================================
Index: SPECS/X11.spec
diff -u SPECS/X11.spec:1.177 SPECS/X11.spec:1.178
--- SPECS/X11.spec:1.177	Sun Jan  1 21:23:24 2006
+++ SPECS/X11.spec	Mon Jan  2 18:09:28 2006
@@ -394,6 +394,7 @@
 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
@@ -559,7 +560,6 @@
 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
@@ -567,9 +567,13 @@
 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
@@ -3456,6 +3460,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.178  2006/01/02 17:09:28  glen
+- X11-OpenGL-libGL obsoletes XFree86-Mesa-libGL (provides same library)
+- sort obsoletes
+
 Revision 1.177  2006/01/01 20:23:24  arekm
 - rel 2; r300 dri; whole libxf86config.a built with fPIC
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11.spec?r1=1.177&r2=1.178&f=u