- ln %{_kernelsrcdir}/scripts for without dist_kernel

[packages/xorg-driver-video-nvidia.git] / xorg-driver-video-nvidia.spec

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 150aef84473bbf0b82010f44c4bfd4dd4f871aa8..bb6c9e33363de57eea9d533d0a0e9387aaba066e 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -8,9 +8,9 @@
 %bcond_with    verbose         # verbose build (V=1)
 #
 %define                _nv_ver         1.0
-%define                _nv_rel         7676
+%define                _nv_rel         8178
 %define                _min_x11        6.7.0
-%define                _rel            1
+%define                _rel            2
 #
 %define                need_x86        0
 %define                need_x8664      0
@@ -34,15 +34,15 @@ Version:    %{_nv_ver}.%{_nv_rel}
 Release:       %{_rel}
 License:       nVidia Binary
 Vendor:                nVidia Corp.
-Group:         X11/XFree86
+Group:         X11
 # why not pkg0!?
 %if %{need_x86}
-Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg0.run
-# Source0-md5: 2474c5513006668b0fba401e042dc009
+Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
+# Source0-md5: bc9d459bfeee93735e3959de041635df
 %endif
 %if %{need_x8664}
-Source1:       http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg0.run
-# Source1-md5: 06a0a2d06c7f849510b4682d9d13946a
+Source1:       http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg1.run
+# Source1-md5: 0da016f8d5138c1ee51b7fa375821574
 %endif
 Patch0:                %{name}-gcc34.patch
 Patch1:                %{name}-GL.patch
@@ -50,7 +50,9 @@ Patch2:               %{name}-conftest.patch
 # http://www.minion.de/files/1.0-6629/
 URL:           http://www.nvidia.com/object/linux.html
 BuildRequires: grep
+%if %{with kernel}
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
+%endif
 BuildRequires: %{kgcc_package}
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: sed >= 4.0
@@ -181,14 +183,14 @@ cd %{_builddir}
 rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %ifarch %{ix86}
 /bin/sh %{SOURCE0} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg0
+%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1
 %else
 /bin/sh %{SOURCE1} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg0
+%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg1
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -204,6 +206,10 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        ln -sf %{_kernelsrcdir}/config-$cfg .config
        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
+%if %{without dist_kernel}
+       ln -sf %{_kernelsrcdir}/scripts
+%endif
        touch include/config/MARKER
        %{__make} -C %{_kernelsrcdir} clean \
                RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \