- added Obsoletes for X11-driver-*-dri packages

Changed files:
    Mesa.spec -> 1.147

diff --git a/Mesa.spec b/Mesa.spec
index 5b496229c15890a3e2b038d9d1cc5bcb8b604ee9..3acaf4f2a10b6683e01f2c2574ec7b3cc54895b1 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -264,6 +264,7 @@ Group:              X11/Libraries
 Requires:      xorg-driver-video-ati
 Requires:      xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
+Obsoletes:     X11-driver-radeon-dri
 
 %description dri-driver-ati-radeon-R100
 X.org DRI drivers for ATI R100 card family (Radeon 7000-7500).
@@ -278,6 +279,7 @@ Group:              X11/Libraries
 Requires:      xorg-driver-video-ati
 Requires:      xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
+Obsoletes:     X11-driver-radeon-dri
 
 %description dri-driver-ati-radeon-R200
 X.org DRI drivers for ATI R200 card family (Radeon 8500-92xx)
@@ -292,6 +294,7 @@ Group:              X11/Libraries
 Requires:      xorg-driver-video-ati
 Requires:      xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
+Obsoletes:     X11-driver-radeon-dri
 
 %description dri-driver-ati-radeon-R300
 X.org DRI drivers for ATI R300 card family.
@@ -306,6 +309,7 @@ Group:              X11/Libraries
 Requires:      xorg-driver-video-ati
 Requires:      xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
+Obsoletes:     X11-driver-r128-dri
 
 %description dri-driver-ati-rage128
 X.org DRI drivers for ATI rage128 card family.
@@ -334,6 +338,7 @@ Group:              X11/Libraries
 Requires:      xorg-driver-video-glint
 Requires:      xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
+Obsoletes:     X11-driver-glint-dri
 
 %description dri-driver-glint
 X.org DRI drivers for GLINT/Permedia card family.
@@ -348,6 +353,7 @@ Group:              X11/Libraries
 Requires:      xorg-driver-video-i810
 Requires:      xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
+Obsoletes:     X11-driver-i810-dri
 
 %description dri-driver-intel-i810
 X.org DRI drivers for Intel i810 card family.
@@ -363,6 +369,7 @@ Requires:   xorg-driver-video-i810
 Requires:      xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
 Obsoletes:     Mesa-dri-driver-intel-i830
+Obsoletes:     X11-driver-i810-dri
 
 %description dri-driver-intel-i915
 X.org DRI drivers for Intel i915 card family.
@@ -379,6 +386,7 @@ Requires:   xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
 Obsoletes:     Mesa-dri-driver-intel-i830
 Obsoletes:     Mesa-dri-driver-intel-i915
+Obsoletes:     X11-driver-i810-dri
 
 %description dri-driver-intel-i965
 X.org DRI drivers for Intel i965 card family.
@@ -393,6 +401,7 @@ Group:              X11/Libraries
 Requires:      xorg-driver-video-mga
 Requires:      xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
+Obsoletes:     X11-driver-mga-dri
 
 %description dri-driver-matrox
 X.org DRI drivers for Matrox G card family.
@@ -449,6 +458,7 @@ Group:              X11/Libraries
 Requires:      xorg-driver-video-sis
 Requires:      xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
+Obsoletes:     X11-driver-sis-dri
 
 %description dri-driver-sis
 X.org DRI drivers for SiS card family.
@@ -464,6 +474,7 @@ Requires:   Glide3-DRI
 Requires:      xorg-driver-video-tdfx
 Requires:      xorg-xserver-libglx(glapi) = %{version}
 Requires:      xorg-xserver-server
+Obsoletes:     X11-driver-tdfx-dri
 
 %description dri-driver-tdfx
 X.org DRI drivers for 3DFX Voodoo card family (Voodoo 3,4,5, Banshee