SPECS: xorg-driver-video-nvidia.spec - add todo about Mesa-libGL - more adv...

[glen]

Author: glen                         Date: Thu May 15 13:02:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add todo about Mesa-libGL
- more advanced %post message for different kernel brands

---- Files affected:
SPECS:
   xorg-driver-video-nvidia.spec (1.148 -> 1.149) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia.spec
diff -u SPECS/xorg-driver-video-nvidia.spec:1.148 SPECS/xorg-driver-video-nvidia.spec:1.149
--- SPECS/xorg-driver-video-nvidia.spec:1.148	Thu May 15 14:56:10 2008
+++ SPECS/xorg-driver-video-nvidia.spec	Thu May 15 15:02:48 2008
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+# TODO
+# - solve this:
+#   error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686
+#   error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
@@ -46,7 +50,7 @@
 Provides:	OpenGL = 2.1
 Provides:	OpenGL-GLX = 1.4
 Provides:	xorg-xserver-libglx
-%if !%{with multigl}
+%if %{without multigl}
 Obsoletes:	Mesa
 %endif
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
@@ -55,7 +59,7 @@
 Obsoletes:	XFree86-OpenGL-libGL < 1:7.0.0
 Obsoletes:	XFree86-driver-nvidia
 Obsoletes:	XFree86-nvidia
-%if !%{with multigl}
+%if %{without multigl}
 Conflicts:	Mesa-libGL
 %endif
 Conflicts:	XFree86-OpenGL-devel <= 4.2.0-3
@@ -210,7 +214,7 @@
 	usr/lib/libnvidia-cfg.so.%{version}		\
 	usr/lib/libGL{,core}.so.%{version}		\
 	usr/X11R6/lib/libXvMCNVIDIA.so.%{version}	\
-%if !%{with multigl}
+%if %{without multigl}
 	usr/X11R6/lib/libXvMCNVIDIA.a			\
 ; do
 	install $f $RPM_BUILD_ROOT%{_libdir}
@@ -262,10 +266,14 @@
 
 %post
 /sbin/ldconfig
-cat << EOF
-NOTE: You must install:
-kernel-video-nvidia-%{version}
-for this driver to work
+cat << 'EOF'
+NOTE: You must also install kernel module for this driver to work
+  kernel-video-nvidia-%{version}
+  kernel-laptop-video-nvidia-%{version}
+  kernel-desktop-video-nvidia-%{version}
+
+Depending on which kernel brand you use.
+
 EOF
 %if %{with multigl}
 if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then
@@ -356,6 +364,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.149  2008-05-15 13:02:48  glen
+- add todo about Mesa-libGL
+- more advanced %post message for different kernel brands
+
 Revision 1.148  2008-05-15 12:56:10  glen
 - disable debug packages if kernel only build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-nvidia.spec?r1=1.148&r2=1.149&f=u