- rebuild for kernel-3.7.9-2

[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 5ec1d0a92a8d0660bbc6456433939d5255ee812c..589e069a14cb40f56e83170fcb92849a6a6d1355 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -1,5 +1,6 @@
 # TODO
 # - should -libs Require main package?
+# - drop binary-only nvidia-settings from here, and use nvidia-settings.spec for it?
 #
 # Conditional build:
 %bcond_without dist_kernel     # without distribution kernel
@@ -20,21 +21,22 @@
 %endif
 %define                no_install_post_check_so 1
 
-%define                rel 2
+%define                rel 15
 %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}
-Version:       310.19
+# when updating version here, keep nvidia-settings.spec in sync as well
+Version:       310.32
 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: 2adbdd38540b3a8955714760e05f575d
+# Source0-md5: 219608da023a318e2c023497e5ba9296
 Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: 0ba08d32852e442ebba5ba22c7abed36
+# Source1-md5: 2e9a8aeb74c17df70376fd59ff1c4125
 Source2:       %{pname}-xinitrc.sh
 Source3:       gl.pc.in
 Source4:       10-nvidia.conf
@@ -61,7 +63,9 @@ Conflicts:    XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
-%define                _noautoreqdep   libGL.so.1
+%define                _noautoreqdep   libGL.so.1 libnvcuvid.so
+# libnvidia-encode.so.*.* links with libnvcuvid.so instead of libnvcuvid.so.1
+%define                _noautoreq      libnvcuvid.so
 
 %description
 This driver set adds improved 2D functionality to the Xorg X server as