+# TODO
+# - solve this (shouldn't there be some obsoletes?):
+# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686
+# error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686
#
# Conditional build:
%bcond_without dist_kernel # without distribution kernel
%endif
%define pname xorg-driver-video-nvidia
-%define rel 4
+%define rel 3
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.12
+Version: 173.14.09
Release: %{rel}%{?with_multigl:.mgl}
License: nVidia Binary
Group: X11
-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
+Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
+# Source0-md5: 02bc9536ad2800855c66684f4c981a74
+Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
+# Source1-md5: 5f174d4fa50d774df8667c1c063adfb2
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}
Provides: OpenGL = 2.1
Provides: OpenGL-GLX = 1.4
Provides: xorg-xserver-libglx
-%if !%{with multigl}
+%if %{without multigl}
Obsoletes: Mesa
%endif
Obsoletes: X11-OpenGL-core < 1:7.0.0
Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0
Obsoletes: XFree86-driver-nvidia
Obsoletes: XFree86-nvidia
-%if !%{with multigl}
+%if %{without multigl}
Conflicts: Mesa-libGL
%endif
Conflicts: XFree86-OpenGL-devel <= 4.2.0-3
%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
usr/lib/libnvidia-cfg.so.%{version} \
usr/lib/libGL{,core}.so.%{version} \
usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \
-%if !%{with multigl}
+%if %{without multigl}
usr/X11R6/lib/libXvMCNVIDIA.a \
; do
install $f $RPM_BUILD_ROOT%{_libdir}
%post
/sbin/ldconfig
-cat << EOF
-NOTE: You must install:
-kernel-video-nvidia-%{version}
-for this driver to work
+cat << 'EOF'
+NOTE: You must also install kernel module for this driver to work
+ kernel-video-nvidia-%{version}
+ kernel-laptop-video-nvidia-%{version}
+ kernel-desktop-video-nvidia-%{version}
+
+Depending on which kernel brand you use.
+
EOF
%if %{with multigl}
if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then