SPECS: svgalib.spec - updated but doesn't build

[arekm]

Author: arekm                        Date: Sat Feb 11 14:06:40 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated but doesn't build

---- Files affected:
SPECS:
   svgalib.spec (1.155 -> 1.156) 

---- Diffs:

================================================================
Index: SPECS/svgalib.spec
diff -u SPECS/svgalib.spec:1.155 SPECS/svgalib.spec:1.156
--- SPECS/svgalib.spec:1.155	Thu Jan 26 11:05:01 2006
+++ SPECS/svgalib.spec	Sat Feb 11 15:06:35 2006
@@ -36,7 +36,7 @@
 Summary(uk):	îÉÚŘËĎŇŚ×ÎĹ×Á ÂŚÂĚŚĎÔĹËÁ ĐĎ×ÎĎĹËŇÁÎÎϧ SVGA ÇŇÁĆŚËÉ
 Name:		svgalib
 Version:	1.9.24
-%define	_rel	2
+%define	_rel	3
 Release:	%{_rel}
 License:	distributable
 Group:		Libraries
@@ -336,18 +336,11 @@
 %if %{with kernel}
 %if %{kernel26}
 cd kernel/svgalib_helper
-ln -sf %{_kernelsrcdir}/config-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist} .config
-install -d include/{linux,config}
-ln -sf %{_kernelsrcdir}/include/linux/autoconf-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.h include/linux/autoconf.h
-%ifarch ppc ppc64
-install -d include/asm
-[ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm
-[ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
-%else
-ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-%endif
-ln -sf %{_kernelsrcdir}/Module.symvers-up Module.symvers
-touch include/config/MARKER
+install -d o/include/linux
+ln -sf %{_kernelsrcdir}/config-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist} o/.config
+ln -sf %{_kernelsrcdir}/Module.symvers-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist} o/Module.symvers
+ln -sf %{_kernelsrcdir}/include/linux/autoconf-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.h o/include/linux/autoconf.h
+%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 if grep -q class_simple_create %{_kernelsrcdir}/include/linux/device.h ; then
 	CLF=-DCLASS_SIMPLE=1
 else
@@ -356,7 +349,7 @@
 %{__make} -C %{_kernelsrcdir} modules \
 	CLASS_CFLAGS="$CLF" \
 	SUBDIRS=`pwd` \
-	O=`pwd` \
+	O=`pwd`/o \
 	V=1
 rm -rf .*.cmd include include2 scripts arch
 cd -
@@ -376,24 +369,17 @@
 %if %{with dist_kernel} && %{with smp}
 %if %{kernel26}
 cd kernel/svgalib_helper
-ln -sf %{_kernelsrcdir}/config-smp .config
-install -d include/{linux,config}
-ln -sf %{_kernelsrcdir}/include/linux/autoconf-smp.h include/linux/autoconf.h
-%ifarch ppc ppc64
-install -d include/asm
-[ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm
-[ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
-# no longer exists in 2.6.14.x
-touch include/asm/segment.h
-%else
-ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-%endif
+install -d o/include/linux
+ln -sf %{_kernelsrcdir}/config-smp o/.config
+ln -sf %{_kernelsrcdir}/include/linux/autoconf-smp.h o/include/linux/autoconf.h
 ln -sf %{_kernelsrcdir}/Module.symvers-smp Module.symvers
-touch include/config/MARKER
+%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+# no longer exists in 2.6.14.x
+touch o/include/asm/segment.h
 %{__make} -C %{_kernelsrcdir} modules \
 	CLASS_CFLAGS="$CLF" \
 	SUBDIRS=`pwd` \
-	O=`pwd` \
+	O=`pwd`/o \
 	V=1
 cd -
 %else
@@ -501,6 +487,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.156  2006/02/11 14:06:35  arekm
+- updated but doesn't build
+
 Revision 1.155  2006/01/26 10:05:01  arekm
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/svgalib.spec?r1=1.155&r2=1.156&f=u