packages: xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec - merge fr...

[matik]

Author: matik                        Date: Fri Jan  8 11:21:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge from STABLE - revert 1.236: breaks upgrades when version changes
- rel 2

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

---- 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.243 packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.244
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.243	Tue Dec 29 22:58:28 2009
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec	Fri Jan  8 12:21:44 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,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.244  2010/01/08 11:21:44  matik
+- merge from STABLE - revert 1.236: breaks upgrades when version changes
+- rel 2
+
 Revision 1.243  2009/12/29 21:58:28  wiget
 - updated to 190.53
 
================================================================

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