packages (STABLE): xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec -...

[hawk]

Author: hawk                         Date: Tue Jan  5 22:51:27 2010 GMT
Module: packages                      Tag: STABLE
---- Log message:
- don't rename nvidia_drv.so to nvidia_drv.so.%{version}, ldconfig doesn't
  create symlink for that lib and old driver is being left in its place
  causing X startup failure after upgrade

---- Files affected:
packages/xorg-driver-video-nvidia:
   xorg-driver-video-nvidia.spec (1.212.2.17 -> 1.212.2.18) 

---- Diffs:

================================================================
Index: packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec
diff -u packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.212.2.17 packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.212.2.18
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.212.2.17	Wed Dec 30 15:18:47 2009
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec	Tue Jan  5 23:51:22 2010
@@ -25,7 +25,7 @@
 %endif
 
 %define		pname		xorg-driver-video-nvidia
-%define		rel		1
+%define		rel		2
 
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -273,7 +273,7 @@
 install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
 install usr/X11R6/lib/modules/drivers/nvidia_drv.so \
-	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
+	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
 install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
@@ -281,7 +281,6 @@
 install usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda
 
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
-ln -sf nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
 ln -sf libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1
 
 %if %{with multigl}
@@ -335,7 +334,6 @@
 fi
 %else
 /sbin/ldconfig -N %{_libdir}/xorg/modules/extensions
-/sbin/ldconfig -N %{_libdir}/xorg/modules/drivers
 %endif
 
 %post	libs -p /sbin/ldconfig
@@ -355,8 +353,7 @@
 %attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
 %attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so
-%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 
 %files libs
 %if %{with multigl}
@@ -428,6 +425,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212.2.18  2010/01/05 22:51:22  hawk
+- don't rename nvidia_drv.so to nvidia_drv.so.%{version}, ldconfig doesn't
+  create symlink for that lib and old driver is being left in its place
+  causing X startup failure after upgrade
+
 Revision 1.212.2.17  2009/12/30 14:18:47  hawk
 - %{_alt_kernel} in src package name is required to keep multiple kernels
   in one package tree
================================================================

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