From f0034016944eddad2a5dcdc8337a85d0f414e19d Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: Tue, 16 Oct 2012 21:35:14 +0000
Subject: [PATCH] * Tue Oct 16 2012 Leigh Scott <leigh123linux@googlemail.com>
 - 1:310.14-1 - Update to 310.14

---
 .gitignore               |  4 ++--
 sources                  |  4 ++--
 xorg-x11-drv-nvidia.spec | 11 +++++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 379c77b..623481a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-304.51.run
-NVIDIA-Linux-x86_64-304.51.run
+NVIDIA-Linux-x86-310.14.run
+NVIDIA-Linux-x86_64-310.14.run
diff --git a/sources b/sources
index b9ea07b..ea76d1e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4fde294e139a31528ea7f6efd8885a09  NVIDIA-Linux-x86-304.51.run
-3144f4a49a13e2ca938255fd42494f0d  NVIDIA-Linux-x86_64-304.51.run
+93b6fcf100a94e4e5fafc4ccd740a590  NVIDIA-Linux-x86-310.14.run
+347ffd1c88e57476d26dfd0e36584acc  NVIDIA-Linux-x86_64-310.14.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 20af7ed..a348b32 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -6,7 +6,7 @@
 
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
-Version:         304.51
+Version:         310.14
 Release:         1%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
@@ -78,13 +78,11 @@ Provides:        xorg-x11-drv-nvidia-newest = %{version}-101
 %filter_from_provides /^libGLCore\.so/d;
 %filter_from_provides /^libGL\.so/d;
 %filter_from_provides /^libvdpau_nvidia\.so\.1/d;
-%filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d;
 %filter_from_provides /^libglx\.so/d;
 %filter_from_requires /^libnvidia/d;
 %filter_from_requires /^libGLCore\.so/d;
 %filter_from_requires /^libGL\.so/d;
 %filter_from_requires /^libvdpau_nvidia\.so\.1/d;
-%filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d;
 %filter_from_requires /^libglx\.so/d;
 %filter_setup
 }
@@ -200,7 +198,6 @@ install -p -m 0755 libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/mo
 install -p -m 0755 libglx.so.%{version}        $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/
 install -p -m 0755 nvidia_drv.so               $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
 install -p -m 0755 libvdpau*.so.%{version}     $RPM_BUILD_ROOT%{_libdir}/vdpau/
-install -p -m 0644 libXvMCNVIDIA.a             $RPM_BUILD_ROOT%{nvidialibdir}/
 
 # Install binaries
 install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server} $RPM_BUILD_ROOT%{_bindir}
@@ -351,19 +348,21 @@ fi ||:
 
 %files devel
 %defattr(-,root,root,-)
-%exclude %{nvidialibdir}/libXvMCNVIDIA.a
 %exclude %{nvidialibdir}/libcuda.so
 %{_includedir}/nvidia/
 %{nvidialibdir}/libOpenCL.so
 %{nvidialibdir}/libnvidia-compiler.so
 %{nvidialibdir}/libGL.so
-%{nvidialibdir}/libXvMCNVIDIA.so
 %{nvidialibdir}/libnvcuvid.so
 %{nvidialibdir}/libnvidia-ml.so
 %{nvidialibdir}/libnvidia-opencl.so
+%{nvidialibdir}/libnvidia-encode.so
 
 
 %changelog
+* Tue Oct 16 2012 Leigh Scott <leigh123linux@googlemail.com> - 1:310.14-1
+- Update to 310.14
+
 * Mon Sep 24 2012 Leigh Scott <leigh123linux@googlemail.com> - 1:304.51-1
 - Update to 304.51