Browse Source

iproute: update to 2.6.38.1, build with iptables, add BR: iptables-devel,

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3648 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 years ago
parent
commit
e109fda3d8
1 changed files with 18 additions and 10 deletions
  1. 18 10
      i/iproute/iproute-vl.spec

+ 18 - 10
i/iproute/iproute-vl.spec

@@ -4,8 +4,8 @@
 Summary: Advanced IP routing and network device configuration tools
 Summary(ja): IP ルーティング,ネットワークデバイスの設定ツール
 Name: iproute
-Version: 2.6.31
-Release: 5%{?_dist_release}
+Version: 2.6.38.1
+Release: 1%{?_dist_release}
 Group: Applications/System
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 URL:	http://linux-net.osdl.org/index.php/Iproute2
@@ -17,8 +17,9 @@ Patch4: iproute2-sharepath.patch
 Patch5: iproute2-2.6.31-tc_modules.patch
 Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
 Patch7: iproute2-example-cbq-service.patch
-Patch8: iproute2-2.6.32-macvlan.patch
-Patch9: iproute2-2.6.33-kernel-headers.patch
+Patch8: iproute2-2.6.35-print-route.patch
+Patch9: iproute2-print-route-u32.patch
+Patch10:iproute2-2.6.33-create-peer-veth-without-a-name.patch
 
 # VINE
 Patch100: iproute2-2.6.15-platex.patch
@@ -26,7 +27,8 @@ Patch100: iproute2-2.6.15-platex.patch
 License: GPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex psutils db4-devel bison
-
+BuildRequires: iptables-devel >= 1.4.10
+Requires: iptables >= 1.4.10
 
 %description
 The iproute package contains networking utilities (ip and rtmon, for
@@ -52,6 +54,7 @@ Libraries, include files, etc you can use to develop iproute2.
 %prep
 %setup -q -n iproute2-%{version}
 %patch0 -p1
+sed -i "s/_VERSION_/%{version}/" man/man8/ss.8
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
 %patch3 -p1 -b .seg
@@ -59,15 +62,16 @@ Libraries, include files, etc you can use to develop iproute2.
 %patch5 -p1 -b .ipt
 %patch6 -p1 -b .ipproto
 %patch7 -p1 -b .fix_cbq
-%patch8 -p1 -b .macvlan
-%patch9 -p1 -b .headers
+%patch8 -p1 -b .print-route
+%patch9 -p1 -b .print-route-u32
+%patch10 -p1 -b .peer-veth-without-name
 
 %patch100 -p1 -b .platex
 
 
 %build
 export LIBDIR=%{_libdir}
-
+export IPT_LIB_DIR=/%_lib}/xtables
 make %{?_smp_mflags}
 
 %install
@@ -123,8 +127,7 @@ EOF
 %files
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/iproute2
-%doc README.decnet README.iproute2+tc RELNOTES
-%doc examples
+%doc README.decnet README.iproute2+tc RELNOTES README.distribution README.lnstat
 %doc iproute2-%{version}/examples
 /sbin/*
 %{_mandir}/man8/*
@@ -146,6 +149,11 @@ EOF
 
 
 %changelog
+* Fri Apr 22 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.38-1
+- update to 2.6.38.1
+- build with iptables-1.4.10
+- add BR: iptables-devel
+
 * Mon Apr 18 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.31-5
 - don't build/include documents. (almost same as man pages...)
 - remove BR: texlive ,linuxdoc-tools