X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=xorg-driver-video-nvidia.spec;h=3480c3d64b2a0dc3d21d8ba7eb19221af68bff58;hb=e8eae3798b635352e67d017c6840c09ef20c6fa7;hp=91fc5a6417f7b8e6b10efbaf07dd43e268331ead;hpb=80e3ff72f414906e5728ff48ed7a6725074569b1;p=packages%2Fxorg-driver-video-nvidia.git

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 91fc5a6..3480c3d 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -1,3 +1,7 @@
+# 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
@@ -9,6 +13,10 @@
 %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		1
@@ -16,14 +24,14 @@
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(pl.UTF-8):	Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:		%{pname}%{_alt_kernel}
-Version:	173.08
+Version:	173.14.05
 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:	b809290b6c4ed638a29b850be8d19e7d
+# Source0-md5:	cbccd6770a890723e78e4fadfcc3836a
 Source1:	http://http.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
-# Source1-md5:	7cc3f6319df6fa62cf1666347241c22a
+# Source1-md5:	1c0164c91bf4fffb96978c489349b419
 Source2:	%{pname}-xinitrc.sh
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
@@ -40,7 +48,7 @@ Requires:	xorg-xserver-server(videodrv-abi) = 2.0
 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
@@ -49,7 +57,7 @@ Obsoletes:	XFree86-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
@@ -201,7 +209,7 @@ for f in \
 	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}
@@ -253,10 +261,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %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