SPECS: p2p.spec - rel 5; hardcode iptables ver; fix ppc/sparc

[arekm]

Author: arekm                        Date: Thu Jan 12 19:35:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 5; hardcode iptables ver; fix ppc/sparc

---- Files affected:
SPECS:
   p2p.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/p2p.spec
diff -u SPECS/p2p.spec:1.15 SPECS/p2p.spec:1.16
--- SPECS/p2p.spec:1.15	Sat Dec 31 11:50:36 2005
+++ SPECS/p2p.spec	Thu Jan 12 20:35:20 2006
@@ -7,8 +7,14 @@
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 
+%ifarch sparc
+%undefine	with_smp
+%endif
+
 %define		no_install_post_compress_modules	1
 
+%define		iptables_ver	1.3.3
+
 Summary:	P2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl):	P2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
 Name:		kernel-net-p2p
@@ -100,7 +106,8 @@
 %build
 %if %{with userspace}
 # iptables module
-IPTABLES_VERSION=`rpm -q --queryformat '%{V}' iptables`
+# IPTABLES_VERSION=`rpm -q --queryformat '%{V}' iptables`
+IPTABLES_VERSION="%{iptables_ver}"
 cd iptables
 cat << EOF > Makefile
 CC		= %{__cc}
@@ -130,7 +137,14 @@
     install -d include/{linux,config}
     ln -sf %{_kernelsrcdir}/config-$cfg .config
     ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-    ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%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_a
+rch}/* include/asm
+%else
+        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%endif
     ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
     touch include/config/MARKER
     %{__make} -C %{_kernelsrcdir} clean \
@@ -202,6 +216,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/01/12 19:35:20  arekm
+- rel 5; hardcode iptables ver; fix ppc/sparc
+
 Revision 1.15  2005/12/31 10:50:36  andree
 - added iptables version detection
 
================================================================

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