#
### 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
Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/old GF2/Quadro
Name: X11-driver-nvidia-legacy
Version: %{_nv_ver}.%{_nv_rel}
-Release: %{_rel}.2
+Release: %{_rel}
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
-Patch4: NVIDIA_kernel-1.0-7174-1258475.diff
-Patch5: NVIDIA_kernel-1.0-7174-1296092.diff
-Patch6: NVIDIA_kernel-1.0-7174-1321905.diff
-Patch7: NVIDIA_kernel-1.0-7174-1361053.diff
-Patch8: NVIDIA_kernel-1.0-7174-1386866.diff
-# 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}
%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.
%endif
%patch0 -p1
%patch1 -p1
-#%patch2 -p1
%if %{with verbose}
-%patch3 -p1
+%patch2 -p0
%endif
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
%build
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} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+ %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
%else
install -d o/include/config
touch o/include/config/MARKER