SPECS (LINUX_2_6_16): p2p.spec - fixes from LINUX_2_6_22, build for 2.6.60.62

[glen]

Author: glen                         Date: Thu Oct 16 23:58:57 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- fixes from LINUX_2_6_22, build for 2.6.60.62

---- Files affected:
SPECS:
   p2p.spec (1.23.2.26 -> 1.23.2.26.2.1) 

---- Diffs:

================================================================
Index: SPECS/p2p.spec
diff -u SPECS/p2p.spec:1.23.2.26 SPECS/p2p.spec:1.23.2.26.2.1
--- SPECS/p2p.spec:1.23.2.26	Thu Jul  3 15:28:44 2008
+++ SPECS/p2p.spec	Fri Oct 17 01:58:51 2008
@@ -18,16 +18,19 @@
 %if "%{_alt_kernel}" != "%{nil}"
 %undefine	with_userspace
 %endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
+%endif
 
-%define		no_install_post_compress_modules	1
+%define		rel 	65
 %define		iptables_ver	1.3.3
-
 %define		pname	p2p
 Summary:	P2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl.UTF-8):	P2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
 Name:		%{pname}%{_alt_kernel}
 Version:	0.3.0a
-Release:	63
+Release:	%{rel}
 License:	GPL
 Group:		Base/Kernel
 Source0:	http://dl.sourceforge.net/iptables-p2p/iptables-p2p-%{version}.tar.gz
@@ -61,9 +64,10 @@
 %package -n kernel%{_alt_kernel}-net-p2p
 Summary:	P2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl.UTF-8):	P2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
-%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 Requires(post,postun):	/sbin/depmod
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 
 %description -n kernel%{_alt_kernel}-net-p2p
 iptables-p2p is a P2P match module for iptables. It supports the
@@ -84,9 +88,10 @@
 %package -n kernel%{_alt_kernel}-smp-net-p2p
 Summary:	P2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl.UTF-8):	P2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
+Release:	%{rel}@%{_kernel_vermagic}
 Group:		Base/Kernel
-%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
 Requires(post,postun):	/sbin/depmod
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
 
 %description -n kernel%{_alt_kernel}-smp-net-p2p
 iptables-p2p is a P2P match module for iptables. It supports the
@@ -107,6 +112,7 @@
 %package -n iptables-p2p
 Summary:	P2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl.UTF-8):	P2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
+Release:	%{rel}
 Group:		Base/Kernel
 Requires:	iptables
 
@@ -130,6 +136,8 @@
 %build
 %if %{with userspace}
 # iptables module
+# IPTABLES_VERSION=`rpm -q --queryformat '%{V}' iptables`
+IPTABLES_VERSION="%{iptables_ver}"
 cat << 'EOF' > iptables/Makefile
 CC		= %{__cc}
 CFLAGS		= %{rpmcflags} -fPIC -DIPTABLES_VERSION=\"%{iptables_ver}\"
@@ -205,6 +213,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23.2.26.2.1  2008/10/16 23:58:51  glen
+- fixes from LINUX_2_6_22, build for 2.6.60.62
+
 Revision 1.23.2.26  2008/07/03 13:28:44  glen
 - convert to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/p2p.spec?r1=1.23.2.26&r2=1.23.2.26.2.1&f=u