%bcond_with multigl # package libGL and libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
%bcond_with verbose # verbose build (V=1)
-%define no_install_post_strip 1
-
%if "%{_alt_kernel}" != "%{nil}"
%undefine with_userspace
%endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define _enable_debug_packages 0
+%endif
%define pname xorg-driver-video-nvidia
-%define rel 2
+%define rel 4
Summary: Linux Drivers for nVidia GeForce/Quadro Chips
Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro
Name: %{pname}%{_alt_kernel}
-Version: 169.07
+Version: 169.12
Release: %{rel}%{?with_multigl:.mgl}
License: nVidia Binary
Group: X11
-Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
-# Source0-md5: c4e9374dc4e7ce1a84dbfe25a800188a
-Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
-# Source1-md5: 7011bafddac098c5792b7fa73e86d610
+Source0: http://http.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
+# Source0-md5: c1d45a150a90e6a11da21623493a628e
+Source1: http://http.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
+# Source1-md5: 8d29f4541f35e10ef06e566c57500cc1
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}
%description progs -l pl.UTF-8
Narzędzia do zarządzania kartami graficznymi nVidia.
+%if %{with kernel}
%package -n kernel%{_alt_kernel}-video-nvidia
Summary: nVidia kernel module for nVidia Architecture support
Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
%description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8
Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez
sterownik nVidii dla Xorg/XFree86.
+%endif
%prep
cd %{_builddir}
%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
%postun -p /sbin/ldconfig
+%if %{with kernel}
%post -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
%postun -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
+%endif
%if %{with userspace}
%files