Author: hawk Date: Thu Nov 23 20:06:05 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %build_kernel_modules, %install_kernel_modules
- alt_kernel support
- release 8
---- Files affected:
SPECS:
p2p.spec (1.19 -> 1.20)
---- Diffs:
================================================================
Index: SPECS/p2p.spec
diff -u SPECS/p2p.spec:1.19 SPECS/p2p.spec:1.20
--- SPECS/p2p.spec:1.19 Wed Apr 12 13:43:24 2006
+++ SPECS/p2p.spec Thu Nov 23 21:05:59 2006
@@ -15,22 +15,23 @@
%define iptables_ver 1.3.3
-%define _rel 7
+%define _rel 8
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
+Name: kernel%{_alt_kernel}-net-p2p
Version: 0.3.0a
Release: [EMAIL PROTECTED]
License: GPL
Group: Base/Kernel
Source0:
http://dl.sourceforge.net/iptables-p2p/iptables-p2p-%{version}.tar.gz
# Source0-md5: 79832eb411003fb35f0c6a0985649c14
-Patch0: %{name}-Makefile.patch
-Patch1: %{name}-iptables.patch
+Patch0: kernel-net-p2p-Makefile.patch
+Patch1: kernel-net-p2p-iptables.patch
URL: http://sourceforge.net/projects/iptables-p2p/
%{?with_userspace:BuildRequires: iptables-devel}
%if %{with kernel} && %{with dist_kernel}
-BuildRequires: kernel-module-build
+BuildRequires: kernel%{_alt_kernel}-module-build
+BuildRequires: rpmbuild(macros) >= 1.330
%endif
%{?with_dist_kernel:%requires_releq_kernel_up}
Requires(post,postun): /sbin/depmod
@@ -52,7 +53,7 @@
Ten pakiet zawiera moduł jądra Linuksa.
-%package -n kernel-smp-net-p2p
+%package -n kernel%{_alt_kernel}-smp-net-p2p
Summary: P2P - a netfilter extension to identify P2P filesharing traffic
Summary(pl): P2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
Release: [EMAIL PROTECTED]
@@ -60,7 +61,7 @@
%{?with_dist_kernel:%requires_releq_kernel_smp}
Requires(post,postun): /sbin/depmod
-%description -n kernel-smp-net-p2p
+%description -n kernel%{_alt_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
@@ -68,7 +69,7 @@
This package contains Linux SMP kernel module.
-%description -n kernel-smp-net-p2p -l pl
+%description -n kernel%{_alt_kernel}-smp-net-p2p -l pl
iptables-p2p to moduł dopasowywania P2P dla iptables. Obsługuje
wykrywanie następujących protokołów: FastTrack (KaZaa, Grokster...),
eDonkey (eDonkey, eMule...), Direct Connect, Gnutella (zwykli klienci
@@ -127,32 +128,7 @@
# kernel module(s)
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
- 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 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
-%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 \
- 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
+%build_kernel_modules -m ipt_p2p
cd ..
%endif
@@ -165,13 +141,7 @@
%endif
%if %{with kernel}
-install -d
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/net/ipv4/netfilter
-install kernel/ipt_p2p-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko
\
-
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipt_p2p.ko
-%if %{with smp} && %{with dist_kernel}
-install kernel/ipt_p2p-smp.ko \
-
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ipv4/netfilter/ipt_p2p.ko
-%endif
+%install_kernel_modules -m kernel/ipt_p2p -d kernel/net/ipv4/netfilter
%endif
%clean
@@ -183,10 +153,10 @@
%postun
%depmod %{_kernel_ver}
-%post -n kernel-smp-net-p2p
+%post -n kernel%{_alt_kernel}-smp-net-p2p
%depmod %{_kernel_ver}smp
-%postun -n kernel-smp-net-p2p
+%postun -n kernel%{_alt_kernel}-smp-net-p2p
%depmod %{_kernel_ver}smp
%if %{with kernel}
@@ -195,7 +165,7 @@
/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/*
%if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-net-p2p
+%files -n kernel%{_alt_kernel}-smp-net-p2p
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/kernel/net/ipv4/netfilter/*
%endif
@@ -213,6 +183,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2006/11/23 20:05:59 hawk
+- use %build_kernel_modules, %install_kernel_modules
+- alt_kernel support
+- release 8
+
Revision 1.19 2006/04/12 11:43:24 glen
- adapterized, use 'EOF'
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/p2p.spec?r1=1.19&r2=1.20&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
