From: hawk <hawk@pld-linux.org>
Date: Wed, 30 Apr 2008 21:47:10 +0000 (+0000)
Subject: - fix building with kernel 2.6.25
X-Git-Tag: auto/th/xorg-driver-video-nvidia-169_12-4~1
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=commitdiff_plain;h=d35ce91ff64531f89607eb8b3462ae8d9569f554

- fix building with kernel 2.6.25

Changed files:
    xorg-driver-video-nvidia.spec -> 1.146
---

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 65d5674..3f3ee53 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -27,6 +27,7 @@ Source1:	http://http.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-
 Source2:	%{pname}-xinitrc.sh
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
+Patch2:		NVIDIA_kernel-169.12-2286310.diff
 URL:		http://www.nvidia.com/object/unix.html
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -164,6 +165,9 @@ rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
 %endif
 %patch0 -p1
 %patch1 -p1
+%if "%{_kernel_ver}" >= "2.6.25"
+%patch2 -p0
+%endif
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
 
 %build