rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.87,1.88

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6039

Modified Files:
	xorg-x11-drv-nvidia.spec 
Log Message:
* Tue Oct 16 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:310.14-1
- Update to 310.14



Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- xorg-x11-drv-nvidia.spec	16 Oct 2012 21:35:14 -0000	1.87
+++ xorg-x11-drv-nvidia.spec	16 Oct 2012 22:21:11 -0000	1.88
@@ -7,7 +7,7 @@
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
 Version:         310.14
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -82,6 +82,7 @@
 %filter_from_requires /^libnvidia/d;
 %filter_from_requires /^libGLCore\.so/d;
 %filter_from_requires /^libGL\.so/d;
+%filter_from_requires /^libnvcuvid/d;
 %filter_from_requires /^libvdpau_nvidia\.so\.1/d;
 %filter_from_requires /^libglx\.so/d;
 %filter_setup
@@ -340,6 +341,7 @@
 %config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
 %{nvidialibdir}/*.so.*
 %{nvidialibdir}/libcuda.so
+%{nvidialibdir}/libnvcuvid.so
 %{nvidialibdir}/libnvidia-glcore.so
 %{nvidialibdir}/tls/*.so*
 %exclude %{_libdir}/vdpau/libvdpau.*
@@ -353,13 +355,15 @@
 %{nvidialibdir}/libOpenCL.so
 %{nvidialibdir}/libnvidia-compiler.so
 %{nvidialibdir}/libGL.so
-%{nvidialibdir}/libnvcuvid.so
 %{nvidialibdir}/libnvidia-ml.so
 %{nvidialibdir}/libnvidia-opencl.so
 %{nvidialibdir}/libnvidia-encode.so
 
 
 %changelog
+* Tue Oct 16 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:310.14-2
+- move libnvcuvid.so to main package
+
 * Tue Oct 16 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:310.14-1
 - Update to 310.14