- release 2

[packages/X11-driver-nvidia-legacy.git] / X11-driver-nvidia-legacy.spec

diff --git a/X11-driver-nvidia-legacy.spec b/X11-driver-nvidia-legacy.spec
index 7bdbd8d9b2769b8e541c83ed08a9d74ab23d68b5..c227afe606a88cf5e1688ddae30634f4abbf0dcc 100644 (file)
--- a/X11-driver-nvidia-legacy.spec
+++ b/X11-driver-nvidia-legacy.spec
@@ -7,9 +7,9 @@
 #
 ### DON'T CHANGE THIS ###############
 %define                _nv_ver         1.0
-%define                _nv_rel         7174
+%define                _nv_rel         7182
 %define                _min_x11        6.7.0
-%define                _rel            6
+%define                _rel            2
 #####################################
 #
 %define                oldname         X11-driver-nvidia
@@ -23,22 +23,18 @@ License:    nVidia Binary
 Group:         X11
 # why not pkg0!?
 Source0:       http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5: e9840ae34ae9f5a3dc7d0fafe040c8af
+# Source0-md5: a7c84815943dc4784a207608abf2e5d6
 Source1:       http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run
-# Source1-md5: 125ec3ecc64202c6c27ef762a438d0f0
+# Source1-md5: 5a670a73a8887bdc776064aecae8f769
 Patch0:                %{name}-gcc34.patch
 Patch1:                %{name}-GL.patch
-Patch2:                %{name}-conftest.patch
-Patch3:                %{name}-verbose.patch
-# http://www.minion.de/files/1.0-6629/
+Patch2:                %{name}-verbose.patch
 URL:           http://www.nvidia.com/object/linux.html
 BuildRequires: %{kgcc_package}
 #BuildRequires:        X11-devel >= %{_min_x11}        # disabled for now
-BuildRequires: grep
-%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
+%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.7}
 BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: sed >= 4.0
-BuildRequires: textutils
 BuildConflicts:        XFree86-nvidia
 Requires:      X11-Xserver
 Requires:      X11-libs >= %{_min_x11}
@@ -67,13 +63,13 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %endif
 
 %description
-This driver set adds improved 2D functionality to the Xorg X
-server as well as high performance OpenGL acceleration, AGP support,
-support for most flat panels, and multiple monitor support.
+This driver set adds improved 2D functionality to the Xorg X server as
+well as high performance OpenGL acceleration, AGP support, support for
+most flat panels, and multiple monitor support.
 
 Hardware: nVidia TNT, TNT2, GeForce, old GeForce2 or Quadro based
-graphics accelerator. New GeForce2, GeForce3 and GeForce4 adapters
-are supported by X11-driver-nvidia package. The nVidia NV1 and RIVA
+graphics accelerator. New GeForce2, GeForce3 and GeForce4 adapters are
+supported by X11-driver-nvidia package. The nVidia NV1 and RIVA
 128/128ZX chips are supported in the base Xorg or XFree86 install and
 are not supported by this driver set.
 
@@ -182,9 +178,8 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %if %{with verbose}
-%patch3 -p1
+%patch2 -p0
 %endif
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
@@ -196,21 +191,27 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
                exit 1
        fi
-        install -d o/include/linux
-        ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-        ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-        %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+       install -d o/include/linux
+       ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+       ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+%if %{with dist_kernel}
+       %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+       install -d o/include/config
+       touch o/include/config/MARKER
+       ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
        %{__make} -C %{_kernelsrcdir} clean \
                RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
                SYSSRC=%{_kernelsrcdir} \
-               SYSOUT=$PWD \
+               SYSOUT=$PWD/o \
                M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
        %{__make} -C %{_kernelsrcdir} modules \
                CC="%{__cc}" CPP="%{__cpp}" \
                SYSSRC=%{_kernelsrcdir} \
-               SYSOUT=$PWD \
+               SYSOUT=$PWD/o \
                M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
        mv nvidia.ko nvidia-$cfg.ko