SPECS: p2p.spec - adapterized, use 'EOF'

[glen]

Author: glen                         Date: Wed Apr 12 11:43:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized, use 'EOF'

---- Files affected:
SPECS:
   p2p.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/p2p.spec
diff -u SPECS/p2p.spec:1.18 SPECS/p2p.spec:1.19
--- SPECS/p2p.spec:1.18	Sat Mar 11 13:27:02 2006
+++ SPECS/p2p.spec	Wed Apr 12 13:43:24 2006
@@ -15,11 +15,11 @@
 
 %define		iptables_ver	1.3.3
 
+%define		_rel 7
 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
 Version:	0.3.0a
-%define		_rel 7
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL
 Group:		Base/Kernel
@@ -39,9 +39,8 @@
 %description
 iptables-p2p is a P2P match module for iptables. It supports the
 detection of the following protocols: FastTrack (KaZaa, Grokster,
-...), eDonkey (eDonkey, eMule, ...), Direct Connect, Gnutella
-(regular clients and Shareaza's gnutella 2), BitTorrent, OpenFT
-(giFT).
+...), eDonkey (eDonkey, eMule, ...), Direct Connect, Gnutella (regular
+clients and Shareaza's gnutella 2), BitTorrent, OpenFT (giFT).
 
 This package contains Linux kernel module.
 
@@ -64,9 +63,8 @@
 %description -n kernel-smp-net-p2p
 iptables-p2p is a P2P match module for iptables. It supports the
 detection of the following protocols: FastTrack (KaZaa, Grokster,
-...), eDonkey (eDonkey, eMule, ...), Direct Connect, Gnutella
-(regular clients and Shareaza's gnutella 2), BitTorrent, OpenFT
-(giFT).
+...), eDonkey (eDonkey, eMule, ...), Direct Connect, Gnutella (regular
+clients and Shareaza's gnutella 2), BitTorrent, OpenFT (giFT).
 
 This package contains Linux SMP kernel module.
 
@@ -88,9 +86,8 @@
 %description -n iptables-p2p
 iptables-p2p is a P2P match module for iptables. It supports the
 detection of the following protocols: FastTrack (KaZaa, Grokster,
-...), eDonkey (eDonkey, eMule, ...), Direct Connect, Gnutella
-(regular clients and Shareaza's gnutella 2), BitTorrent, OpenFT
-(giFT).
+...), eDonkey (eDonkey, eMule, ...), Direct Connect, Gnutella (regular
+clients and Shareaza's gnutella 2), BitTorrent, OpenFT (giFT).
 
 %description -n iptables-p2p -l pl
 iptables-p2p to moduł dopasowywania P2P dla iptables. Obsługuje
@@ -109,16 +106,17 @@
 # IPTABLES_VERSION=`rpm -q --queryformat '%{V}' iptables`
 IPTABLES_VERSION="%{iptables_ver}"
 cd iptables
-cat << EOF > Makefile
+cat << 'EOF' > Makefile
 CC		= %{__cc}
-CFLAGS		= %{rpmcflags} -fPIC -DIPTABLES_VERSION=\\"$IPTABLES_VERSION\\"
+CFLAGS		= %{rpmcflags} -fPIC -DIPTABLES_VERSION=\"%{iptables_ver}\"
+#"-vim
 INCPATH		= -I../common
 LD		= %{__ld}
 .SUFFIXES:	.c .o .so
 .c.o:
-		\$(CC) \$(CFLAGS) \$(INCPATH) -c -o \$@ \$<
+		$(CC) $(CFLAGS) $(INCPATH) -c -o $@ $<
 .o.so:
-		\$(LD) -shared -o \$@ \$<
+		$(LD) -shared -o $@ $<
 all:		libipt_p2p.so
 EOF
 %{__make}
@@ -130,30 +128,30 @@
 cd kernel
 cp ../common/ipt_p2p.h .
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-    if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+	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
+	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 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
+	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
+	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 \
-        RCS_FIND_IGNORE="-name '*.ko' -o" \
-        M=$PWD O=$PWD \
-        %{?with_verbose:V=1}
-    %{__make} -C %{_kernelsrcdir} modules \
-        M=$PWD O=$PWD \
-        %{?with_verbose:V=1}
-    mv ipt_p2p{,-$cfg}.ko
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
+	touch include/config/MARKER
+	%{__make} -C %{_kernelsrcdir} clean \
+		RCS_FIND_IGNORE="-name '*.ko' -o" \
+		M=$PWD O=$PWD \
+		%{?with_verbose:V=1}
+	%{__make} -C %{_kernelsrcdir} modules \
+		M=$PWD O=$PWD \
+		%{?with_verbose:V=1}
+	mv ipt_p2p{,-$cfg}.ko
 done
 cd ..
 %endif
@@ -215,6 +213,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/04/12 11:43:24  glen
+- adapterized, use 'EOF'
+
 Revision 1.18  2006/03/11 12:27:02  arekm
 - rel 7
 
================================================================

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