SPECS: metapackage-xorg.spec - fixed OpenGL and DPS O:/P:

[baggins]

Author: baggins                      Date: Sat Feb 17 17:48:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed OpenGL and DPS O:/P:

---- Files affected:
SPECS:
   metapackage-xorg.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/metapackage-xorg.spec
diff -u SPECS/metapackage-xorg.spec:1.15 SPECS/metapackage-xorg.spec:1.16
--- SPECS/metapackage-xorg.spec:1.15	Sat Feb 17 18:29:58 2007
+++ SPECS/metapackage-xorg.spec	Sat Feb 17 18:48:31 2007
@@ -105,6 +105,7 @@
 Group:		X11
 Requires:	xorg-xserver-server
 Provides:	XFree86-OpenGL-core = %{epoch}:%{version}-%{release}
+Obsoletes:	XFree86-OpenGL-core
 
 %description -n X11-OpenGL-core
 OpenGL-core package that allows easier monolithic X11->modular xorg
@@ -120,6 +121,7 @@
 Group:		X11
 Requires:	Mesa-libGL
 Provides:	XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
+Obsoletes:	XFree86-OpenGL-libGL
 
 %description -n X11-OpenGL-libGL
 OpenGL-libGL package that allows easier monolithic X11->modular xorg
@@ -150,6 +152,7 @@
 Summary(pl.UTF-8):	Pakiet OpenGL-devel-base ułatwiający przejście z monolitycznego X11 na modularne xorg
 Group:		X11
 Provides:	XFree86-OpenGL-devel-base = %{epoch}:%{version}-%{release}
+Obsoletes:	XFree86-OpenGL-devel-base
 
 %description -n X11-OpenGL-devel-base
 OpenGL-devel-base package that allows easier monolithic X11->modular
@@ -165,6 +168,7 @@
 Group:		X11
 Requires:	Mesa-libGL-devel
 Provides:	XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
+Obsoletes:	XFree86-OpenGL-devel
 
 %description -n X11-OpenGL-devel
 OpenGL-devel package that allows easier monolithic X11->modular xorg
@@ -180,6 +184,7 @@
 Group:		X11
 Requires:	Mesa-libGL-static
 Provides:	XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
+Obsoletes:	XFree86-OpenGL-static
 
 %description -n X11-OpenGL-static
 OpenGL-static package that allows easier monolithic X11->modular xorg
@@ -310,11 +315,7 @@
 Provides:	XFree86-devel = %{epoch}:%{version}-%{release}
 # common obsoletes
 Obsoletes:	X11-DPS-devel
-Obsoletes:	X11-OpenGL-devel
-Obsoletes:	X11-OpenGL-devel-base
 Obsoletes:	XFree86-DPS-devel
-Obsoletes:	XFree86-OpenGL-devel
-Obsoletes:	XFree86-OpenGL-devel-base
 
 %description -n X11-devel
 devel package that allows easier monolithic X11->modular xorg upgrade.
@@ -1062,12 +1063,8 @@
 # Rest of libs deps will be fetched on per so-name rule.
 # Common obsoletes:
 Obsoletes:	X11-DPS
-Obsoletes:	X11-OpenGL-core
-Obsoletes:	X11-OpenGL-libGL
 Obsoletes:	X11-common
 Obsoletes:	XFree86-DPS
-Obsoletes:	XFree86-OpenGL-core
-Obsoletes:	XFree86-OpenGL-libGL
 Obsoletes:	XFree86-common
 
 %description -n X11-libs
@@ -1154,9 +1151,7 @@
 Provides:	XFree86-static = %{epoch}:%{version}-%{release}
 # common obsoletes
 Obsoletes:	X11-DPS-static
-Obsoletes:	X11-OpenGL-static
 Obsoletes:	XFree86-DPS-static
-Obsoletes:	XFree86-OpenGL-static
 
 %description -n X11-static
 static package that allows easier monolithic X11->modular xorg
@@ -1206,13 +1201,6 @@
 Requires:	xorg-app-xtrap
 Requires:	xorg-app-xwininfo
 Provides:	XFree86-tools = %{epoch}:%{version}-%{release}
-# common obsoletes
-Obsoletes:	X11-DPS
-Obsoletes:	X11-DPS-devel
-Obsoletes:	X11-DPS-static
-Obsoletes:	XFree86-DPS
-Obsoletes:	XFree86-DPS-devel
-Obsoletes:	XFree86-DPS-static
 
 %description -n X11-tools
 tools package that allows easier monolithic X11->modular xorg upgrade.
@@ -1517,6 +1505,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007/02/17 17:48:31  baggins
+- fixed OpenGL and DPS O:/P:
+
 Revision 1.15  2007/02/17 17:29:58  baggins
 - fix twm provides
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/metapackage-xorg.spec?r1=1.15&r2=1.16&f=u