packages: xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec - rel 7 -=?UTF-8?Q?=20?=...

[baggins]

Author: baggins                      Date: Mon Feb  6 21:54:16 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7
- create non-conflicting ld.so configs

---- Files affected:
packages/xorg-driver-video-nvidia:
   xorg-driver-video-nvidia.spec (1.361 -> 1.362) 

---- 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.361 packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.362
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.361	Mon Feb  6 22:36:15 2012
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec	Mon Feb  6 22:54:11 2012
@@ -27,7 +27,7 @@
 Summary(pl.UTF-8):	Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:		%{pname}
 Version:	290.10
-Release:	6
+Release:	7
 Epoch:		1
 License:	nVidia Binary
 Group:		X11
@@ -288,8 +288,13 @@
 
 ln -sf libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1
 
+%ifarch %{x8664}
+echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf
+echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf
+%else
 echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
 echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
+%endif
 
 # OpenGL ABI for Linux compatibility
 ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
@@ -351,7 +356,7 @@
 %dir %{_sysconfdir}/OpenCL
 %dir %{_sysconfdir}/OpenCL/vendors
 %{_sysconfdir}/OpenCL/vendors/nvidia.icd
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf
 %dir %{_libdir}/nvidia
 %attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1
@@ -419,6 +424,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.362  2012/02/06 21:54:11  baggins
+- rel 7
+- create non-conflicting ld.so configs
+
 Revision 1.361  2012/02/06 21:36:15  baggins
 - mesa todo is obsolete
 
================================================================

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