SPECS (LINUX_2_6): X11-driver-nvidia.spec - update from AC-branch

[glen]

Author: glen                         Date: Tue May 27 06:31:35 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- update from AC-branch

---- Files affected:
SPECS:
   X11-driver-nvidia.spec (1.78.2.9.2.36.2.2 -> 1.78.2.9.2.36.2.3) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.78.2.9.2.36.2.2 SPECS/X11-driver-nvidia.spec:1.78.2.9.2.36.2.3
--- SPECS/X11-driver-nvidia.spec:1.78.2.9.2.36.2.2	Sat May 24 13:17:03 2008
+++ SPECS/X11-driver-nvidia.spec	Tue May 27 08:31:30 2008
@@ -12,19 +12,18 @@
 %if "%{_alt_kernel}" != "%{nil}"
 %undefine	with_userspace
 %endif
-
-%if "%{alt_kernel}" == "desktop" || "%{alt_kernel}" == "vanilla"
-%define		smp_kernel	1
-%else
-%define		smp_kernel	1
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
 %endif
 
+%define		rel		2
 %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:	169.12
-Release:	2
+Release:	%{rel}
 License:	nVidia Binary
 Group:		X11
 Source0:	http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
@@ -34,11 +33,12 @@
 Source2:	%{pname}-settings.desktop
 Source3:	%{pname}-xinitrc.sh
 Patch0:		%{pname}-GL.patch
+Patch1:		%{pname}-xen.patch
 URL:		http://www.nvidia.com/object/unix.html
 %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
@@ -125,6 +125,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
@@ -153,6 +154,7 @@
 %setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg1
 %endif
 %patch0 -p1
+%patch1 -p1
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -284,6 +286,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78.2.9.2.36.2.3  2008-05-27 06:31:30  glen
+- update from AC-branch
+
 Revision 1.78.2.9.2.36.2.2  2008-05-24 11:17:03  glen
 - release 2
 
================================================================

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