- X11-OpenGL-libGL obsoletes XFree86-Mesa-libGL (provides same library)

- sort obsoletes

Changed files:
    X11.spec -> 1.178

diff --git a/X11.spec b/X11.spec
index 4bd46b6c7830b2fa699f649009f3eb74c2824bb7..f1a144de58468a1a7478a6937fff3cf9904a96f2 100644 (file)
--- 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