SPECS: X11-driver-nvidia-legacy.spec - changes from X11-driver-nvi...

[wolvverine]

Author: wolvverine                   Date: Fri Mar  3 01:20:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- changes from X11-driver-nvidia.spec

---- Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.17 SPECS/X11-driver-nvidia-legacy.spec:1.18
--- SPECS/X11-driver-nvidia-legacy.spec:1.17	Wed Mar  1 00:37:25 2006
+++ SPECS/X11-driver-nvidia-legacy.spec	Fri Mar  3 02:20:30 2006
@@ -19,7 +19,7 @@
 Summary(pl):	Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/old GF2/Quadro
 Name:		X11-driver-nvidia-legacy
 Version:	%{_nv_ver}.%{_nv_rel}
-Release:	%{_rel}
+Release:	%{_rel}.1
 License:	nVidia Binary
 Group:		X11
 # why not pkg0!?
@@ -31,6 +31,7 @@
 Patch1:		%{name}-GL.patch
 Patch2:		%{name}-conftest.patch
 Patch3:		%{name}-verbose.patch
+#Patch4:	%{name}-nv_map_sg.patch
 # http://www.minion.de/files/1.0-6629/
 URL:		http://www.nvidia.com/object/linux.html
 BuildRequires:	%{kgcc_package}
@@ -183,10 +184,11 @@
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %if %{with verbose}
 %patch3 -p1
 %endif
+#%patch4 -p1
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -197,21 +199,27 @@
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-        install -d o/include/linux
-        ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-        ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-        %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+%if %{with dist_kernel}
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
 		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD \
+		SYSOUT=$PWD/o \
 		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	%{__make} -C %{_kernelsrcdir} modules \
 		CC="%{__cc}" CPP="%{__cpp}" \
 		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD \
+		SYSOUT=$PWD/o \
 		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	mv nvidia.ko nvidia-$cfg.ko
@@ -349,6 +357,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/03/03 01:20:30  wolvverine
+- changes from X11-driver-nvidia.spec
+
 Revision 1.17  2006/02/28 23:37:25  glen
 - adapterized (killed trailing spaces/tabs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11-driver-nvidia-legacy.spec?r1=1.17&r2=1.18&f=u