Author: arekm Date: Fri Feb 24 00:09:18 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- new building way
---- Files affected:
SPECS:
ipp2p.spec (1.39 -> 1.40)
---- Diffs:
================================================================
Index: SPECS/ipp2p.spec
diff -u SPECS/ipp2p.spec:1.39 SPECS/ipp2p.spec:1.40
--- SPECS/ipp2p.spec:1.39 Thu Jan 5 21:51:06 2006
+++ SPECS/ipp2p.spec Fri Feb 24 01:09:13 2006
@@ -7,11 +7,13 @@
%bcond_without userspace # don't build userspace module
%bcond_with verbose # verbose build (V=1)
#
+%define iptables_ver 1.3.3
+#
Summary: IPP2P - a netfilter extension to identify P2P filesharing
traffic
Summary(pl): IPP2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
Name: ipp2p
Version: 0.8.1_rc1
-%define _rel 1
+%define _rel 2
Release: %{_rel}
Epoch: 1
License: GPL
@@ -19,7 +21,7 @@
Source0: http://www.ipp2p.org/downloads/%{name}-%{version}.tar.gz
# Source0-md5: eebaf70b9c820f2537df4bac2466dd91
URL: http://www.ipp2p.org/
-%{?with_userspace:BuildRequires: iptables-devel}
+%{?with_userspace:BuildRequires: iptables-devel >= 1.3.3}
%if %{with kernel}
%ifarch sparc
BuildRequires: crosssparc64-gcc
@@ -184,7 +186,7 @@
%build
%if %{with userspace}
-IPTABLES_VERSION=`rpm -q --queryformat '%{V}' iptables`
+IPTABLES_VERSION="%{iptables_ver}"
%{__cc} %{rpmcflags} -DIPTABLES_VERSION=\"$IPTABLES_VERSION\" -fPIC -c
libipt_ipp2p.c
#vim: "
ld %{rpmldflags} -shared -o libipt_ipp2p.so libipt_ipp2p.o
@@ -196,35 +198,20 @@
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 \
- %{?with_verbose:V=1}
+ RCS_FIND_IGNORE="-name '*.ko' -o" \
+ M=$PWD O=$PWD/o \
+ %{?with_verbose:V=1}
%{__make} -C %{_kernelsrcdir} modules \
-%if "%{_target_base_arch}" != "%{_arch}"
- ARCH=%{_target_base_arch} \
- CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
-%endif
- HOSTCC="%{__cc}" \
- M=$PWD O=$PWD \
- %{?with_verbose:V=1}
+ CC="%{__cc}" CPP="%{__cpp}" \
+ M=$PWD O=$PWD/o \
+ %{?with_verbose:V=1}
mv ipt_%{name}{,-$cfg}.ko
done
%endif
@@ -286,6 +273,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2006/02/24 00:09:13 arekm
+- new building way
+
Revision 1.39 2006/01/05 20:51:06 dzeus
- up to 0.8.1_rc1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ipp2p.spec?r1=1.39&r2=1.40&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
