SPECS (Titanium): xorg-driver-video-nvidia-legacy.spec - dropped o...

[hawk]

Author: hawk                         Date: Sun Nov 11 22:34:34 2007 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- dropped outdated and unecessary verbose patch
- disable userspace for alt_kernels
- prefix src package with alt kernel if present
- _var -> var
- cleanup

---- Files affected:
SPECS:
   xorg-driver-video-nvidia-legacy.spec (1.46 -> 1.46.2.1) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-nvidia-legacy.spec
diff -u SPECS/xorg-driver-video-nvidia-legacy.spec:1.46 SPECS/xorg-driver-video-nvidia-legacy.spec:1.46.2.1
--- SPECS/xorg-driver-video-nvidia-legacy.spec:1.46	Fri Nov  9 19:17:01 2007
+++ SPECS/xorg-driver-video-nvidia-legacy.spec	Sun Nov 11 23:34:29 2007
@@ -4,27 +4,28 @@
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# without kernel packages
 %bcond_without	userspace	# don't build userspace programs
-%bcond_with	verbose		# verbose build (V=1)
-#
-%define		_min_x11	6.7.0
-%define		_rel		2
-#
+
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine	with_userspace
+%endif
+
++%define	pname		xorg-driver-video-nvidia-legacy
+%define		rel		1
+
 Summary:	Linux Drivers for old nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl.UTF-8):	Sterowniki do starych kart graficznych nVidia TNT/TNT2/GeForce/Quadro
-Name:		xorg-driver-video-nvidia-legacy
+Name:		%{pname}%{_alt_kernel}
 Version:	71.86.01
-Release:	%{_rel}
+Release:	%{rel}
 License:	nVidia Binary
 Group:		X11
-# why not pkg0!?
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
 # Source0-md5:	a4d0d1eb2841a59a4156122a1c08249a
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
 # Source1-md5:	bb273998a661ef5b481e5cd19cf64a3b
 Patch0:		X11-driver-nvidia-legacy-gcc34.patch
 Patch1:		X11-driver-nvidia-legacy-GL.patch
-Patch2:		X11-driver-nvidia-legacy-verbose.patch
-Patch3:		%{name}-desktop.patch
+Patch2:		%{pname}-desktop.patch
 URL:		http://www.nvidia.com/object/unix.html
 BuildRequires:	%{kgcc_package}
 %if %{with kernel} && %{with dist_kernel}
@@ -77,7 +78,7 @@
 Summary:	OpenGL (GL and GLX) header files
 Summary(pl.UTF-8):	Pliki nagłówkowe OpenGL (GL i GLX)
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{pname} = %{version}-%{release}
 Provides:	OpenGL-GLX-devel = 1.3
 Provides:	OpenGL-devel = 1.5
 Obsoletes:	X11-OpenGL-devel-base
@@ -97,7 +98,7 @@
 Summary:	Static XvMCNVIDIA library
 Summary(pl.UTF-8):	Statyczna biblioteka XvMCNVIDIA
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{pname}-devel = %{version}-%{release}
 
 %description static
 Static XvMCNVIDIA library.
@@ -109,7 +110,7 @@
 Summary:	Tools for advanced control of nVidia graphic cards
 Summary(pl.UTF-8):	NarzÄ™dzia do zarzÄ
dzania kartami graficznymi nVidia
 Group:		Applications/System
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{pname} = %{version}-%{release}
 Obsoletes:	XFree86-driver-nvidia-progs
 
 %description progs
@@ -122,7 +123,7 @@
 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
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 Requires:	dev >= 2.7.7-10
@@ -152,12 +153,7 @@
 %endif
 %patch0 -p1
 %patch1 -p1
-%if %{with verbose}
-#patch2 -p0
-echo "ERROR: verbose patch is not upgraded for current version"
-exit 1
-%endif
-%patch3 -p1
+%patch2 -p1
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild
 
 %build
@@ -272,6 +268,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46.2.1  2007-11-11 22:34:29  hawk
+- dropped outdated and unecessary verbose patch
+- disable userspace for alt_kernels
+- prefix src package with alt kernel if present
+- _var -> var
+- cleanup
+
 Revision 1.46  2007-11-09 18:17:01  patrys
 - don't obsolete mesa-libgl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-driver-video-nvidia-legacy.spec?r1=1.46&r2=1.46.2.1&f=u