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

[lisu]

Author: lisu                         Date: Mon Feb  6 09:52:54 2012 GMT
Module: packages                      Tag: STABLE
---- Log message:
- merge from HEAD: added OpenCL icd registration file (path is hardcoded in libOpenCL)

---- Files affected:
packages/xorg-driver-video-nvidia:
   xorg-driver-video-nvidia.spec (1.212.2.28 -> 1.212.2.29) 

---- 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.28 packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.212.2.29
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.212.2.28	Mon Feb  6 10:04:37 2012
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec	Mon Feb  6 10:52:48 2012
@@ -253,7 +253,8 @@
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
 	$RPM_BUILD_ROOT{%{_includedir}/{GL,cuda},%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \
-	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d}
+	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors
 %if %{with multigl}
 install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
 %endif
@@ -263,6 +264,7 @@
 cp -a nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
 cp -a nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
+install -p nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors
 
 for f in \
 	libGL.so.%{version}			\
@@ -373,6 +375,9 @@
 
 %files libs
 %defattr(644,root,root,755)
+%dir %{_sysconfdir}/OpenCL
+%dir %{_sysconfdir}/OpenCL/vendors
+%{_sysconfdir}/OpenCL/vendors/nvidia.icd
 %if %{with multigl}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf
 %dir %{_libdir}/nvidia
@@ -449,6 +454,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212.2.29  2012/02/06 09:52:48  lisu
+- merge from HEAD: added OpenCL icd registration file (path is hardcoded in libOpenCL)
+
 Revision 1.212.2.28  2012/02/06 09:04:37  lisu
 - updated to 290.10
 
================================================================

---- 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.28&r2=1.212.2.29&f=u