Author: baggins Date: Sat Jul 17 10:50:54 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fix C with fglrx driver packages
---- Files affected:
packages/xorg-xserver-server:
xorg-xserver-server.spec (1.241 -> 1.242)
---- Diffs:
================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.241
packages/xorg-xserver-server/xorg-xserver-server.spec:1.242
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.241 Thu Jul 15
08:02:30 2010
+++ packages/xorg-xserver-server/xorg-xserver-server.spec Sat Jul 17
12:50:49 2010
@@ -294,7 +294,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
@@ -316,7 +316,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
@@ -548,6 +548,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.242 2010/07/17 10:50:49 baggins
+- fix C with fglrx driver packages
+
Revision 1.241 2010/07/15 06:02:30 arekm
- up to rc5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.241&r2=1.242&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
