SPECS: kernel-net-p2p.spec - rel 6

[arekm]

Author: arekm                        Date: Sat Feb 11 13:50:04 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 6

---- Files affected:
SPECS:
   kernel-net-p2p.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-p2p.spec
diff -u SPECS/kernel-net-p2p.spec:1.14 SPECS/kernel-net-p2p.spec:1.15
--- SPECS/kernel-net-p2p.spec:1.14	Fri Jan 27 11:55:28 2006
+++ SPECS/kernel-net-p2p.spec	Sat Feb 11 14:49:59 2006
@@ -17,7 +17,7 @@
 Summary(pl):	P2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
 Name:		kernel-net-p2p
 Version:	0.3.0a
-%define		_rel 5
+%define		_rel 6
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL
 Group:		Base/Kernel
@@ -107,7 +107,7 @@
 cd iptables
 cat << EOF > Makefile
 CC		= %{__cc}
-CFLAGS		= %{rpmcflags} -fPIC -DIPTABLES_VERSION=\\"1.3.1\\"
+CFLAGS		= %{rpmcflags} -fPIC -DIPTABLES_VERSION=\\"1.3.3\\"
 INCPATH		= -I../common
 LD		= %{__ld}
 .SUFFIXES:	.c .o .so
@@ -129,29 +129,17 @@
     if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 	exit 1
     fi
-    rm -rf include
-    install -d include/{linux,config}
-    ln -sf %{_kernelsrcdir}/config-$cfg .config
-    ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-%ifarch ppc
-    if [ -d "%{_kernelsrcdir}/include/asm-powerpc" ]; then
-    	install -d include/asm
-	cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
-	cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm
-    else
-        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-    fi
-%else
-    ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-%endif
-    ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-    touch include/config/MARKER
+    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 \
         RCS_FIND_IGNORE="-name '*.ko' -o" \
-        M=$PWD O=$PWD \
+        M=$PWD O=$PWD/o \
         %{?with_verbose:V=1}
     %{__make} -C %{_kernelsrcdir} modules \
-        M=$PWD O=$PWD \
+        M=$PWD O=$PWD/o \
         %{?with_verbose:V=1}
     mv ipt_p2p{,-$cfg}.ko
 done
@@ -215,6 +203,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/02/11 13:49:59  arekm
+- rel 6
+
 Revision 1.14  2006/01/27 10:55:28  arekm
 - no smp on sparc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-net-p2p.spec?r1=1.14&r2=1.15&f=u