packages (XORG_XSERVER_1_8): xorg-xserver-server/xorg-xserver-server.spec -...

[baggins]

Author: baggins                      Date: Sat Jul 17 10:50:25 2010 GMT
Module: packages                      Tag: XORG_XSERVER_1_8
---- Log message:
- fix C with fglrx driver packages

---- Files affected:
packages/xorg-xserver-server:
   xorg-xserver-server.spec (1.237.2.3 -> 1.237.2.4) 

---- Diffs:

================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.237.2.3 packages/xorg-xserver-server/xorg-xserver-server.spec:1.237.2.4
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.237.2.3	Sat Jul 17 11:26:18 2010
+++ packages/xorg-xserver-server/xorg-xserver-server.spec	Sat Jul 17 12:50:20 2010
@@ -295,7 +295,7 @@
 Requires:	%{name} = %{version}-%{release}
 Provides:	xorg-xserver-module(dri)
 %if %{without multigl}
-Conflicts:	xorg-driver-video-fglrx-libdri
+Conflicts:	xorg-driver-video-fglrx
 Conflicts:	xorg-driver-video-nvidia
 %endif
 
@@ -317,7 +317,7 @@
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-core < 1:7.0.0
 %if %{without multigl}
-Conflicts:	xorg-driver-video-fglrx-libglx
+Conflicts:	xorg-driver-video-fglrx
 Conflicts:	xorg-driver-video-nvidia
 %endif
 
@@ -552,6 +552,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.237.2.4  2010/07/17 10:50:20  baggins
+- fix C with fglrx driver packages
+
 Revision 1.237.2.3  2010/07/17 09:26:18  baggins
 - rel 2
 - workaround for Xorg 7.5+ gamma breakage
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.237.2.3&r2=1.237.2.4&f=u