SPECS: xorg-xserver-server.spec - fixed XFree86-Xserver-devel name...

[qboosh]

Author: qboosh                       Date: Mon Apr 30 19:27:04 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed XFree86-Xserver-devel name in Obsoletes
- -libglx Obsoletes: {XFree86,X11}-OpenGL-core

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.80 SPECS/xorg-xserver-server.spec:1.81
--- SPECS/xorg-xserver-server.spec:1.80	Mon Apr 30 21:02:32 2007
+++ SPECS/xorg-xserver-server.spec	Mon Apr 30 21:26:58 2007
@@ -105,6 +105,9 @@
 Obsoletes:	Xserver
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# avoid self-dependencies on included modules
+%define		_noautoreq	libscanpci.so libxf1bpp.so
+
 %description
 Xorg server is a generally used X server which uses display hardware.
 It requires proper driver for your display hardware.
@@ -210,7 +213,7 @@
 Requires:	xorg-proto-videoproto-devel
 Requires:	xorg-proto-xextproto-devel
 Obsoletes:	X11-Xserver-devel < 1:7.0.0
-Obsoletes:	X11-XFree86-devel < 1:7.0.0
+Obsoletes:	XFree86-Xserver-devel < 1:7.0.0
 
 %description devel
 Header files for X.org server.
@@ -225,6 +228,8 @@
 Requires:	%{name} = %{version}-%{release}
 Provides:	xorg-xserver-libglx(glapi) = %{mesa_version}
 Provides:	xorg-xserver-modules-libglx
+Obsoletes:	X11-OpenGL-core < 1:7.0.0
+Obsoletes:	XFree86-OpenGL-core < 1:7.0.0
 Obsoletes:	xorg-driver-video-nvidia
 
 %description -n xorg-xserver-libglx
@@ -395,6 +400,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2007/04/30 19:26:58  qboosh
+- fixed XFree86-Xserver-devel name in Obsoletes
+- -libglx Obsoletes: {XFree86,X11}-OpenGL-core
+
 Revision 1.80  2007/04/30 19:02:32  qboosh
 - main Obsoletes: {XFree86,X11}-setup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-xserver-server.spec?r1=1.80&r2=1.81&f=u