- rel 4

[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 b6fd3ac57ce1463096afe9701521fe309c6fc591..ce12b368a4e4b087a4d0a27a904b58b2d2fa1db3 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -9,9 +9,9 @@
 #
 %define                no_install_post_strip 1
 #
-%define                _nv_ver         100
-%define                _nv_rel         14.23
-%define                _rel            2
+%define                _nv_ver         169
+%define                _nv_rel         04
+%define                _rel            4
 #
 %define                need_x86        0
 %define                need_x8664      0
@@ -36,11 +36,11 @@ License:    nVidia Binary
 Group:         X11
 %if %{need_x86}
 Source0:       http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1.run
-# Source0-md5: 66de6fb23512ac40210cfb7944b3647e
+# Source0-md5: 06a178f5cf10195896974c33ab34c6fb
 %endif
 %if %{need_x8664}
 Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}.%{_nv_rel}-pkg2.run
-# Source1-md5: 11514ccb857def2bb5bd946b345bdf21
+# Source1-md5: e01e2b19d3cb7e91f4df40a3b946b4fb
 %endif
 Source2:       %{name}-xinitrc.sh
 Patch0:                X11-driver-nvidia-GL.patch
@@ -60,7 +60,6 @@ Provides:     OpenGL-GLX = 1.4
 Provides:      xorg-xserver-libglx
 %if !%{with multigl}
 Obsoletes:     Mesa
-Obsoletes:     Mesa-libGL
 %endif
 Obsoletes:     X11-OpenGL-core < 1:7.0.0
 Obsoletes:     X11-OpenGL-libGL < 1:7.0.0
@@ -68,6 +67,9 @@ 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}
+Conflicts:     Mesa-libGL
+%endif
 Conflicts:     XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -299,8 +301,8 @@ fi
 %attr(755,root,root) %{_libdir}/nvidia/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
 %ghost %{_libdir}/xorg/modules/extensions/libglx.so
 %else
@@ -312,11 +314,11 @@ fi
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1
-%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*.*
-%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.*
+%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*
+%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*
 %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
 %endif
-%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*.*
+%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
 %attr(755,root,root) %{_libdir}/xorg/modules/wfb.so
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so