Author: baggins Date: Sat Sep 29 17:55:26 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- if multigl bcond is enabled libglx does not conflict with
xorg-driver-video-nvidia
---- Files affected:
SPECS:
xorg-xserver-server.spec (1.113 -> 1.114)
---- Diffs:
================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.113
SPECS/xorg-xserver-server.spec:1.114
--- SPECS/xorg-xserver-server.spec:1.113 Sat Sep 29 00:44:43 2007
+++ SPECS/xorg-xserver-server.spec Sat Sep 29 19:55:21 2007
@@ -276,7 +276,9 @@
Provides: xorg-xserver-modules-libglx
Obsoletes: X11-OpenGL-core < 1:7.0.0
Obsoletes: XFree86-OpenGL-core < 1:7.0.0
+%if !%{with multigl}
Conflicts: xorg-driver-video-nvidia
+%endif
%description -n xorg-xserver-libglx
GLX extension library fo X.org server.
@@ -496,6 +498,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.114 2007/09/29 17:55:21 baggins
+- if multigl bcond is enabled libglx does not conflict with
xorg-driver-video-nvidia
+
Revision 1.113 2007/09/28 22:44:43 baggins
- put bcond info in release (if enabled)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-xserver-server.spec?r1=1.113&r2=1.114&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
