- rebuild for kernel-3.10.11-1

[packages/xorg-driver-video-nvidia.git] / xorg-driver-video-nvidia.spec

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 823458837c136f727b15f304c28e362693f998d4..9232f3ffb667804051018107565ca26a6472f474 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -1,6 +1,7 @@
 # TODO
 # - should -libs Require main package?
 # - drop binary-only nvidia-settings from here, and use nvidia-settings.spec for it?
+# - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm
 #
 # Conditional build:
 %bcond_without dist_kernel     # without distribution kernel
@@ -22,22 +23,22 @@
 %endif
 %define                no_install_post_check_so 1
 
-%define                rel 4
+%define                rel 3
 %define                pname   xorg-driver-video-nvidia
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):     Linux meghajtók nVidia GeForce/Quadro chipekhez
 Summary(pl.UTF-8):     Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:          %{pname}%{_alt_kernel}
 # when updating version here, keep nvidia-settings.spec in sync as well
-Version:       319.23
+Version:       319.49
 Release:       %{rel}
 Epoch:         1
 License:       nVidia Binary
 Group:         X11
 Source0:       http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5: cbdca80e11b643aa46bded82abe43754
+# Source0-md5: df9eb270f7c6ac79edcd5831e946c4ad
 Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: 74edd76b4bb9229f7d9c00a79f1e3860
+# Source1-md5: d9d7ead9c472e2b1b18679700feeaadf
 Source2:       %{pname}-xinitrc.sh
 Source3:       gl.pc.in
 Source4:       10-nvidia.conf
@@ -181,7 +182,12 @@ Release:   %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 Requires:      dev >= 2.7.7-10
-%{?with_dist_kernel:%requires_releq_kernel}
+%if %{with dist_kernel}
+%requires_releq_kernel
+%if "%{_alt_kernel}" == "%{nil}"
+Requires:      %releq_kernel -n drm
+%endif
+%endif
 Requires:      %{pname} = %{epoch}:%{version}
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel