SPECS: X11-driver-nvidia-legacy.spec - updated gcc34 patch, remove...

[qboosh]

Author: qboosh                       Date: Sat Jul  1 10:21:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated gcc34 patch, removed obsolete conftest,build-fix patches
- make -j1 for prepare+scripts - builds now

---- Files affected:
SPECS:
   X11-driver-nvidia-legacy.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.26 SPECS/X11-driver-nvidia-legacy.spec:1.27
--- SPECS/X11-driver-nvidia-legacy.spec:1.26	Thu Jun 29 21:20:01 2006
+++ SPECS/X11-driver-nvidia-legacy.spec	Sat Jul  1 12:21:28 2006
@@ -29,10 +29,7 @@
 # Source1-md5:	5a670a73a8887bdc776064aecae8f769
 Patch0:		%{name}-gcc34.patch
 Patch1:		%{name}-GL.patch
-Patch2:		%{name}-conftest.patch
-Patch3:		%{name}-verbose.patch
-Patch4:		%{name}-build-fix.patch
-# http://www.minion.de/files/1.0-6629/
+Patch2:		%{name}-verbose.patch
 URL:		http://www.nvidia.com/object/linux.html
 BuildRequires:	%{kgcc_package}
 #BuildRequires:	X11-devel >= %{_min_x11}	# disabled for now
@@ -180,13 +177,11 @@
 /bin/sh %{SOURCE1} --extract-only
 %setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2
 %endif
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
-#%patch2 -p1
 %if %{with verbose}
-%patch3 -p0
+%patch2 -p0
 %endif
-#%patch4 -p1
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -202,7 +197,7 @@
 	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
+	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 %else
 	install -d o/include/config
 	touch o/include/config/MARKER
@@ -355,6 +350,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2006/07/01 10:21:28  qboosh
+- updated gcc34 patch, removed obsolete conftest,build-fix patches
+- make -j1 for prepare+scripts - builds now
+
 Revision 1.26  2006/06/29 19:20:01  shadzik
 - removed obsolete 7174 patches; updated verbose.patch
 - rel 1
================================================================

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