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

[hawk]

Author: hawk                         Date: Sun Aug 29 14:48:35 2010 GMT
Module: packages                      Tag: STABLE
---- Log message:
- don't rename nvidia_drv.so to nvidia_drv.so.%{version}, breaks upgrades

---- Files affected:
packages/xorg-driver-video-nvidia:
   xorg-driver-video-nvidia.spec (1.212.2.23 -> 1.212.2.24) 

---- 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.23 packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.212.2.24
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.212.2.23	Sun Aug 29 16:45:39 2010
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec	Sun Aug 29 16:48:30 2010
@@ -283,7 +283,7 @@
 install -p libglx.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
 install -p 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 -p libnvidia-wfb.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
@@ -291,7 +291,6 @@
 cp -a 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}
@@ -345,8 +344,6 @@
 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
 ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
 %endif
 
@@ -371,8 +368,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
 %defattr(644,root,root,755)
@@ -452,6 +448,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212.2.24  2010/08/29 14:48:30  hawk
+- don't rename nvidia_drv.so to nvidia_drv.so.%{version}, breaks upgrades
+
 Revision 1.212.2.23  2010/08/29 14:45:39  hawk
 - fixed alt_kernel src.rpm name, required to keep multiple versions on ftp
 - keep mgl in release not rel
================================================================

---- 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.23&r2=1.212.2.24&f=u