SPECS (AC-branch): X11-driver-nvidia.spec - update to 169.12

[glen]

Author: glen                         Date: Tue May 27 06:12:26 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- update to 169.12

---- Files affected:
SPECS:
   X11-driver-nvidia.spec (1.78.2.9.2.39 -> 1.78.2.9.2.40) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.78.2.9.2.39 SPECS/X11-driver-nvidia.spec:1.78.2.9.2.40
--- SPECS/X11-driver-nvidia.spec:1.78.2.9.2.39	Sun May 18 16:53:10 2008
+++ SPECS/X11-driver-nvidia.spec	Tue May 27 08:12:20 2008
@@ -14,27 +14,24 @@
 %if "%{_alt_kernel}" != "%{nil}"
 %undefine	with_userspace
 %endif
-
-%if "%{alt_kernel}" == "desktop" || "%{alt_kernel}" == "vanilla"
-%undefine	with_smp
-%undefine	with_up
-%define		smp_kernel	1
-%else
-%define		smp_kernel	0
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
 %endif
 
+%define		rel		1
 %define		pname	X11-driver-nvidia
 Summary:	Linux Drivers for NVIDIA GeForce/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych NVIDIA GeForce/Quadro
 Name:		%{pname}%{_alt_kernel}
-Version:	100.14.19
-Release:	65
+Version:	169.12
+Release:	%{rel}
 License:	nVidia Binary
 Group:		X11
 Source0:	http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
-# Source0-md5:	d2f89f60cef8f9a0cc0ce228b46eeb8b
+# Source0-md5:	c1d45a150a90e6a11da21623493a628e
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg1.run
-# Source1-md5:	3d702d7d67875b4b1e3095c2eb448b29
+# Source1-md5:	5f8a3a3f403a9bac572d86e57ddd0e6a
 Source2:	%{pname}-settings.desktop
 Source3:	%{pname}-xinitrc.sh
 Patch0:		%{pname}-GL.patch
@@ -43,7 +40,7 @@
 %if %{with kernel}
 BuildRequires:	%{kgcc_package}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.330
+BuildRequires:	rpmbuild(macros) >= 1.452
 %endif
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
@@ -130,15 +127,11 @@
 Summary:	nVidia kernel module for nVidia Architecture support
 Summary(de):	Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl):	Modu³ j±dra dla obs³ugi kart graficznych nVidia
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.7.7-10
-%if %{smp_kernel}
-%{?with_dist_kernel:%{!?with_kabi:%requires_releq_kernel}}
-%{?with_dist_kernel:%{?with_kabi:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}}
-%else
 %{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
-%endif
 Provides:	X11-driver-nvidia(kernel)
 Obsoletes:	XFree86-nvidia-kernel
 
@@ -156,6 +149,7 @@
 Summary:	nVidia kernel module for nVidia Architecture support
 Summary(de):	Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(pl):	Modu³ j±dra dla obs³ugi kart graficznych nVidia
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.7.7-10
@@ -283,8 +277,8 @@
 %attr(755,root,root) %{_libdir}/libGLcore.so.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
 %dir /usr/%{_lib}/tls
-%attr(755,root,root) /usr/%{_lib}/libnvidia-tls.so.*.*.*
-%attr(755,root,root) /usr/%{_lib}/tls/libnvidia-tls.so.*.*.*
+%attr(755,root,root) /usr/%{_lib}/libnvidia-tls.so.*.*
+%attr(755,root,root) /usr/%{_lib}/tls/libnvidia-tls.so.*.*
 %attr(755,root,root) /usr/%{_lib}/libGL.so.1
 %attr(755,root,root) /usr/%{_lib}/libGL.so
 %attr(755,root,root) %{_libdir}/modules/lib*
@@ -293,11 +287,9 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{smp_kernel}
 %files -n kernel%{_alt_kernel}-video-nvidia
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
-%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-video-nvidia
@@ -330,6 +322,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78.2.9.2.40  2008-05-27 06:12:20  glen
+- update to 169.12
+
 Revision 1.78.2.9.2.39  2008-05-18 14:53:10  glen
 - release 65
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia.spec?r1=1.78.2.9.2.39&r2=1.78.2.9.2.40&f=u