- no betas in Titanium, back to version 100.14.19

- simplified version/release macros

Changed files:
    xorg-driver-video-nvidia.spec -> 1.126.2.1

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index d0355b2b1db9b16d77db5ab7f49eac7c8ec5cba4..70b52fe29da22193459bf6501c66e5eff524f5f9 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -9,9 +9,8 @@
 #
 %define                no_install_post_strip 1
 #
-%define                _nv_ver         100
-%define                _nv_rel         14.23
-%define                _rel            4
+%define                _nv_ver         100.14.19
+%define                _rel            1
 #
 %define                need_x86        0
 %define                need_x8664      0
@@ -30,17 +29,17 @@
 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}
+Version:       %{_nv_ver}
 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: 66de6fb23512ac40210cfb7944b3647e
+Source0:       http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}/NVIDIA-Linux-x86-%{_nv_ver}-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: 11514ccb857def2bb5bd946b345bdf21
+Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}/NVIDIA-Linux-x86_64-%{_nv_ver}-pkg2.run
+# Source1-md5: 2afec320e9495444bc1582bf358e5237
 %endif
 Source2:       %{name}-xinitrc.sh
 Patch0:                X11-driver-nvidia-GL.patch
@@ -149,7 +148,7 @@ 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}
+Version:       %{_nv_ver}
 Release:       %{_rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
@@ -170,13 +169,13 @@ sterownik nVidii dla Xorg/XFree86.
 
 %prep
 cd %{_builddir}
-rm -rf NVIDIA-Linux-x86*-%{_nv_ver}.%{_nv_rel}-pkg*
+rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-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-%{_nv_ver}-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-%{_nv_ver}-pkg2
 %endif
 %patch0 -p1
 %patch1 -p1