SPECS: zaptel.spec - fixed to build with 2.6.14.7 - rel 2

[averne]

Author: averne                       Date: Sun Feb  5 12:26:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed to build with 2.6.14.7
- rel 2

---- Files affected:
SPECS:
   zaptel.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.52 SPECS/zaptel.spec:1.53
--- SPECS/zaptel.spec:1.52	Sat Feb  4 22:37:31 2006
+++ SPECS/zaptel.spec	Sun Feb  5 13:26:39 2006
@@ -14,7 +14,7 @@
 Summary(pl):	Obsługa urządzeń telefonicznych Zaptel
 Name:		zaptel
 Version:	1.2.3
-%define		_rel	1
+%define		_rel	2
 Release:	%{_rel}
 License:	GPL
 Group:		Base/Kernel
@@ -123,36 +123,34 @@
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-	rm -rf include
 	chmod 000 modules
-	install -d include/{linux,config}
+	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
 	%{__make} -C %{_kernelsrcdir} clean \
-		SUBDIRS=$PWD \
-		O=$PWD \
+		RCS_FIND_IGNORE="-name '*.ko' -o" \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
-	install -d include/config
+	install -d o/include/config
 	chmod 700 modules
-	ln -sf %{_kernelsrcdir}/config-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-${cfg}.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
+	[ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm
+	[ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm
 %else
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm
 %endif
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
+	touch o/include/config/MARKER
 %if %{without dist_kernel}
 	mkdir -p scripts/{basic,mod}
 	ln -sf %{_kernelsrcdir}/scripts/mod/modpost scripts/mod/modpost
 	ln -sf %{_kernelsrcdir}/scripts/basic/fixdep scripts/basic/fixdep
 %endif
 	%{__make} -C %{_kernelsrcdir} modules \
-		KVERS=%{_kernel_ver} \
-		KSRC=%{_kernelsrcdir} \
-		SUBDIRS=$PWD \
-		O=$PWD \
+		CC="%{__cc}" CPP="%{__cpp}" \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	mv *.ko modules/$cfg/
 done
@@ -265,6 +263,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2006/02/05 12:26:39  averne
+- fixed to build with 2.6.14.7
+- rel 2
+
 Revision 1.52  2006/02/04 21:37:31  averne
 - updated to 1.2.3
 - works fine with x86_64
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/zaptel.spec?r1=1.52&r2=1.53&f=u