- prefix src package with alt kernel if present

- _var -> var

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

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 2baee6047bca7958ab4ac408732a4446ee8a4593..c25989fa645aa5a911636c1fa6d3cf71d13f2dea 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -12,21 +12,22 @@
 %undefine      with_userspace
 %endif
 
-%define                _nv_ver         100.14.19
-%define                _rel            1
+%define                pname           xorg-driver-video-nvidia
+%define                nv_ver          100.14.19
+%define                rel             1
 
 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}
-Release:       %{_rel}%{?with_multigl:.mgl}
+Name:          %{pname}%{_alt_kernel}
+Version:       %{nv_ver}
+Release:       %{rel}%{?with_multigl:.mgl}
 License:       nVidia Binary
 Group:         X11
-Source0:       http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}/NVIDIA-Linux-x86-%{_nv_ver}-pkg1.run
+Source0:       http://us.download.nvidia.com/XFree86/Linux-x86/%{nv_ver}/NVIDIA-Linux-x86-%{nv_ver}-pkg1.run
 # Source0-md5: d2f89f60cef8f9a0cc0ce228b46eeb8b
-Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}/NVIDIA-Linux-x86_64-%{_nv_ver}-pkg2.run
+Source1:       http://us.download.nvidia.com/XFree86/Linux-x86_64/%{nv_ver}/NVIDIA-Linux-x86_64-%{nv_ver}-pkg2.run
 # Source1-md5: 2afec320e9495444bc1582bf358e5237
-Source2:       %{name}-xinitrc.sh
+Source2:       %{pname}-xinitrc.sh
 Patch0:                X11-driver-nvidia-GL.patch
 Patch1:                X11-driver-nvidia-desktop.patch
 URL:           http://www.nvidia.com/object/unix.html
@@ -133,8 +134,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}
-Release:       %{_rel}@%{_kernel_ver_str}
+Version:       %{nv_ver}
+Release:       %{rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 Requires:      dev >= 2.7.7-10
@@ -154,13 +155,13 @@ sterownik nVidii dla Xorg/XFree86.
 
 %prep
 cd %{_builddir}
-rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-pkg*
+rm -rf NVIDIA-Linux-x86*-%{nv_ver}-pkg*
 %ifarch %{ix86}
 /bin/sh %{SOURCE0} --extract-only
-%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-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}-pkg2
+%setup -qDT -n NVIDIA-Linux-x86_64-%{nv_ver}-pkg2
 %endif
 %patch0 -p1
 %patch1 -p1