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

[charles]

Author: charles                      Date: Mon Dec  7 01:22:11 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- updated %install and %files (cuda,vdpau)

---- Files affected:
packages/xorg-driver-video-nvidia:
   xorg-driver-video-nvidia.spec (1.230.2.1 -> 1.230.2.2) 

---- 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.230.2.1 packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.230.2.2
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.230.2.1	Mon Nov 30 22:18:26 2009
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec	Mon Dec  7 02:22:06 2009
@@ -241,7 +241,7 @@
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
-	$RPM_BUILD_ROOT{%{_includedir}/{GL,cuda,vdpau},%{_libdir},%{_bindir},%{_mandir}/man1} \
+	$RPM_BUILD_ROOT{%{_includedir}/{GL,cuda,vdpau},%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d}
 %if %{with multigl}
 install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
@@ -257,8 +257,6 @@
 	usr/lib/tls/libnvidia-tls.so.%{version}		\
 	usr/lib/libnvidia-cfg.so.%{version}		\
 	usr/lib/libGL{,core}.so.%{version}		\
-	usr/lib/libcuda.so.%{version}			\
-	usr/lib/libvdpau.so.%{version}			\
 	usr/X11R6/lib/libXvMCNVIDIA.so.%{version}	\
 %if %{without multigl}
 	usr/X11R6/lib/libXvMCNVIDIA.a			\
@@ -269,9 +267,15 @@
 ; do
 	install $f $RPM_BUILD_ROOT%{_libdir}/nvidia
 done
+
 install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
 %endif
 
+install usr/lib/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}
+install usr/lib/libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}
+install usr/lib/vdpau/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
+install usr/lib/vdpau/libvdpau_trace.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
+
 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 \
@@ -281,8 +285,8 @@
 
 install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
 install usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda
-install usr/include/vdpau/*.h $RPM_BUILD_ROOT%{_includedir}/vdpau
 
+ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
 
 %if %{with multigl}
@@ -295,8 +299,6 @@
 ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
 ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
 
-ln -sf nvidia/libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so
-ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
 %else
 # OpenGL ABI for Linux compatibility
 ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
@@ -305,8 +307,6 @@
 ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
 ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1
 
-ln -sf libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so
-ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
 %endif
 %endif
 
@@ -370,10 +370,8 @@
 %attr(755,root,root) %{_libdir}/nvidia/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libvdpau.so.*.*
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
 %ghost %{_libdir}/xorg/modules/extensions/libglx.so
 %else
@@ -385,24 +383,24 @@
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1
-%attr(755,root,root) %{_libdir}/libcuda.so.*.*
 %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*
 %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*
-%attr(755,root,root) %{_libdir}/libvdpau.so.*.*
 %endif
+%attr(755,root,root) %{_libdir}/libcuda.so.*.*
+%attr(755,root,root) %{_libdir}/libvdpau.so.*.*
+%attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.*
+%attr(755,root,root) %{_libdir}/vdpau/libvdpau_trace.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
 %attr(755,root,root) %{_libdir}/libcuda.so
-%attr(755,root,root) %{_libdir}/libvdpau.so
 %dir %{_includedir}/GL
 %{_includedir}/GL/gl.h
 %{_includedir}/GL/glext.h
 %{_includedir}/GL/glx.h
 %{_includedir}/GL/glxext.h
 %{_includedir}/cuda
-%{_includedir}/vdpau
 %if %{with multigl}
 %attr(755,root,root) %{_libdir}/libGL.so
 %endif
@@ -435,6 +433,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.230.2.2  2009/12/07 01:22:06  charles
+- updated %install and %files (cuda,vdpau)
+
 Revision 1.230.2.1  2009/11/30 21:18:26  mguevara
 - up to 195.22-1
 
================================================================

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