packages: xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec - still al...

[glen]

Author: glen                         Date: Thu Jan 21 07:52:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- still allow poldek -i two versions (to be able to prepare for new kernel, while keeping current)

---- Files affected:
packages/xorg-driver-video-nvidia:
   xorg-driver-video-nvidia.spec (1.244 -> 1.245) 

---- 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.244 packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.245
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.244	Fri Jan  8 12:21:44 2010
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec	Thu Jan 21 08:52:54 2010
@@ -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
+	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
 install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
@@ -281,6 +281,7 @@
 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}
@@ -334,6 +335,8 @@
 fi
 %else
 /sbin/ldconfig -N %{_libdir}/xorg/modules/extensions
+# until versioned SONAME is built for nvidia_drv.so, update symlink manually
+ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 %endif
 
 %post	libs -p /sbin/ldconfig
@@ -353,7 +356,8 @@
 %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) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/xorg/modules/drivers/nvidia_drv.so
 
 %files libs
 %if %{with multigl}
@@ -425,6 +429,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.245  2010/01/21 07:52:54  glen
+- still allow poldek -i two versions (to be able to prepare for new kernel, while keeping current)
+
 Revision 1.244  2010/01/08 11:21:44  matik
 - merge from STABLE - revert 1.236: breaks upgrades when version changes
 - rel 2
================================================================

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