X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=06b4e9e6e3e7f6b9e0fcca6faca17c496d7622ba;hp=80d464b155cbc52f1caec1306faeee5d8e36e7c4;hb=1f0d78fc80073e79e7503d9e57510a435c241ac6;hpb=1fdf7dcc7ddb36a6fea7332baf506329fd3cb05e

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 80d464b..06b4e9e 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -8,7 +8,7 @@
 %define		_nv_ver		1.0
 %define		_nv_rel		6629
 %define		_min_x11	6.7.0
-%define		_rel		3
+%define		_rel		4
 #
 Summary:	Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
@@ -26,8 +26,15 @@ Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/N
 Patch0:		%{name}-gcc34.patch
 Patch1:		%{name}-GL.patch
 Patch2:		%{name}-conftest.patch
-Patch3:		%{name}-1165235.patch
-Patch4:		%{name}-1171869.patch
+# http://www.minion.de/files/1.0-6629/
+Patch3:		NVIDIA_kernel-1.0-6629-1155389.diff
+Patch4:		NVIDIA_kernel-1.0-6629-1161283.diff
+Patch5:		NVIDIA_kernel-1.0-6629-1165235.diff
+Patch6:		NVIDIA_kernel-1.0-6629-1171869.diff
+Patch7:		NVIDIA_kernel-1.0-6629-1175225.diff
+Patch8:		NVIDIA_kernel-1.0-6629-1182399.diff
+Patch9:		NVIDIA_kernel-1.0-6629-1189413.diff
+Patch10:	NVIDIA_kernel-1.0-6629-1201042.diff
 URL:		http://www.nvidia.com/object/linux.html
 BuildConflicts:	XFree86-nvidia
 BuildRequires:	grep
@@ -173,6 +180,12 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %patch2 -p1
 %patch3 -p0
 %patch4 -p0
+%patch5 -p0
+%patch6 -p0
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
+%patch10 -p0
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -291,6 +304,7 @@ EOF
 %attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
+%dir /usr/%{_lib}/tls
 %attr(755,root,root) /usr/%{_lib}/libnvidia-tls.so.*.*.*
 %attr(755,root,root) /usr/%{_lib}/tls/libnvidia-tls.so.*.*.*
 %ifarch amd64