SPECS: X11-driver-nvidia-legacy.spec - correct - STBR

[wolvverine]

Author: wolvverine                   Date: Sun Sep 11 19:47:09 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- correct
- STBR

---- Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.7 SPECS/X11-driver-nvidia-legacy.spec:1.8
--- SPECS/X11-driver-nvidia-legacy.spec:1.7	Sun Sep 11 19:49:19 2005
+++ SPECS/X11-driver-nvidia-legacy.spec	Sun Sep 11 21:47:03 2005
@@ -47,17 +47,16 @@
 Provides:	X11-OpenGL-core
 Provides:	X11-OpenGL-libGL
 Provides:	XFree86-OpenGL-core
-Provides:	XFree86-OpenGL-libGL
+Provides:	XFree86-OpenGL-libGL	
 Obsoletes:	Mesa
 Obsoletes:	X11-OpenGL-core
 Obsoletes:	X11-OpenGL-libGL
-Obsoletes:	X11-driver-nvidia
 Obsoletes:	XFree86-OpenGL-core
 Obsoletes:	XFree86-OpenGL-libGL
 Obsoletes:	XFree86-driver-nvidia
 Obsoletes:	XFree86-nvidia
 Obsoletes:	%{oldname} < 1.0.7174
-Conflicts:	%{oldname}
+#Conflicts:	%{oldname}
 Conflicts:	XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -345,6 +344,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/09/11 19:47:03  wolvverine
+- correct
+- STBR
+
 Revision 1.7  2005/09/11 17:49:19  wolvverine
 - correct O
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.7&r2=1.8&f=u