- simplified version/release macros

[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 457af947fb63670bb5e764c19a7b62e01b166f48..683566349266a45cc53cb37528ec1c7711dd6c6d 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -2,50 +2,34 @@
 # Conditional build:
 %bcond_without dist_kernel     # without distribution kernel
 %bcond_without kernel          # without kernel packages
-%bcond_without incall          # include all tarballs
 %bcond_without userspace       # don't build userspace programs
-%bcond_with    verbose         # verbose build (V=1)
 %bcond_with    multigl         # package libGL and libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
-#
+%bcond_with    verbose         # verbose build (V=1)
+
 %define                no_install_post_strip 1
-#
-%define                _nv_ver         100
-%define                _nv_rel         14.19
-%define                _rel            1
-#
-%define                need_x86        0
-%define                need_x8664      0
-%if %{with incall}
-%define                need_x86        1
-%define                need_x8664      1
-%else
-%ifarch %{ix86}
-%define                need_x86        1
-%endif
-%ifarch %{x8664}
-%define                need_x8664      1
-%endif
+
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine      with_userspace
 %endif
-#
+
+%define                pname           xorg-driver-video-nvidia
+%define                rel             2
+
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(pl.UTF-8):     Sterowniki do kart graficznych nVidia GeForce/Quadro
-Name:          xorg-driver-video-nvidia
-Version:       %{_nv_ver}.%{_nv_rel}
-Release:       %{_rel}%{?with_multigl:.mgl}
+Name:          %{pname}%{_alt_kernel}
+Version:       169.07
+Release:       %{rel}%{?with_multigl:.mgl}
 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: d2f89f60cef8f9a0cc0ce228b46eeb8b
-%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: 2afec320e9495444bc1582bf358e5237
-%endif
-Source2:       %{name}-xinitrc.sh
+Source0:       http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
+# Source0-md5: c4e9374dc4e7ce1a84dbfe25a800188a
+Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
+# Source1-md5: 7011bafddac098c5792b7fa73e86d610
+Source2:       %{pname}-xinitrc.sh
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
-URL:           http://www.nvidia.com/object/linux.html
+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}
 %endif
@@ -60,7 +44,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 +51,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)
@@ -147,8 +133,8 @@ Narzędzia do zarządzania kartami graficznymi nVidia.
 Summary:       nVidia kernel module for nVidia Architecture support
 Summary(de.UTF-8):     Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl.UTF-8):     Moduł jądra dla obsługi kart graficznych nVidia
-Version:       %{_nv_ver}.%{_nv_rel}
-Release:       %{_rel}@%{_kernel_ver_str}
+Version:       %{version}
+Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 Requires:      dev >= 2.7.7-10
@@ -168,13 +154,13 @@ sterownik nVidii dla Xorg/XFree86.
 
 %prep
 cd %{_builddir}
-rm -rf NVIDIA-Linux-x86*-%{_nv_ver}.%{_nv_rel}-pkg*
+rm -rf NVIDIA-Linux-x86*-%{version}-pkg*
 %ifarch %{ix86}
 /bin/sh %{SOURCE0} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1
+%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg1
 %else
 /bin/sh %{SOURCE1} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}.%{_nv_rel}-pkg2
+%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg2
 %endif
 %patch0 -p1
 %patch1 -p1
@@ -272,6 +258,11 @@ NOTE: You must install:
 kernel-video-nvidia-%{version}
 for this driver to work
 EOF
+%if %{with multigl}
+if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then
+       ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
+fi
+%endif
 
 %postun        -p /sbin/ldconfig
 
@@ -307,11 +298,11 @@ EOF
 %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