iproute-3.14.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8524 ec354946-7b23-47d6-9f5a-488ba84defc7

i/iproute/iproute-vl.spec

@@ -4,30 +4,34 @@
 Summary: Advanced IP routing and network device configuration tools
 Summary(ja): IP ルーティング,ネットワークデバイスの設定ツール
 Name: iproute
-Version: 2.6.38.1
+Version: 3.14.0
 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
+Source: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.gz
+URL: http://kernel.org/pub/linux/utils/net/%{name}2/
+Source1: cbq-0000.example
+Source2: avpkt
 Patch0: man-pages.patch
-Patch1: iproute2-2.6.29-kernel.patch
-Patch2: iproute2-ss050901-opt_flags.patch
-Patch3: iproute2-2.6.25-segfault.patch
-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.35-print-route.patch
-Patch9: iproute2-print-route-u32.patch
-Patch10:iproute2-2.6.33-create-peer-veth-without-a-name.patch
+Patch1: iproute2-3.4.0-kernel.patch
+Patch2: iproute2-3.11.0-optflags.patch
+Patch3: iproute2-3.9.0-IPPROTO_IP_for_SA.patch
+Patch4: iproute2-example-cbq-service.patch
+Patch5: iproute2-2.6.35-print-route.patch
+Patch6: iproute2-3.12.0-lnstat-dump-to-stdout.patch
+# from RawHide <http://thread.gmane.org/gmane.linux.network/284101>
+Patch7: iproute2-3.11.0-tc-ok.patch
+Patch8: iproute2-3.11.0-rtt.patch
+Patch9: iproute2-3.12.0-lnstat-interval.patch
 
 # VINE
-Patch100: iproute2-2.6.15-platex.patch
+Patch100: iproute2-3.14.0-platex.patch
 
-License: GPLv2+
+License: GPLv2+ and Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: flex psutils db4-devel bison
-BuildRequires: iptables-devel >= 1.4.10
+BuildRequires: bison flex
+BuildRequires: iptables-devel >= 1.4.10, libdb-devel
+BuildRequires: texlive-collection-latexrecommended
+BuildRequires: linuxdoc-tools pkgconfig psutils
 Requires: iptables >= 1.4.10
 
 %description
@@ -38,8 +42,16 @@ capabilities of the Linux 2.4.x and 2.6.x kernel.
 %description -l ja
 このiprouteパッケージには、カーネル 2.4.x または 2.6.x の進歩した
 ネットワーク技術を使うように設計された、ネットワーキングユーティリ
-ティが収録されています(例えばipやrtmonなどが収録されています)。
+ティ(ip, rtmon等々)が収録されています。
+
+%package doc
+Summary: ip and tc documentation with examples
+Summary(ja): ip, tcのドキュメントとサンプル
+Group: Applications/System
+License: GPLv2+
 
+%description doc
+The iproute documentation contains howtos and examples of settings.
 
 %package devel
 Summary: Libraries, includes, etc. to develop iptables
@@ -54,70 +66,95 @@ 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
-%patch4 -p1 -b .share
-%patch5 -p1 -b .ipt
-%patch6 -p1 -b .ipproto
-%patch7 -p1 -b .fix_cbq
-%patch8 -p1 -b .print-route
-%patch9 -p1 -b .print-route-u32
-%patch10 -p1 -b .peer-veth-without-name
+%patch3 -p1 -b .ipproto
+%patch4 -p1 -b .fix_cbq
+%patch5 -p1 -b .print-route
+%patch6 -p1 -b .lnstat-dump-to-stdout
+%patch7 -p1 -b .tc_ok
+%patch8 -p1 -b .rtt
+%patch9 -p1 -b .lnstat-interval
+sed -i 's/^LIBDIR=/LIBDIR?=/' Makefile
 
 %patch100 -p1 -b .platex
 
-
 %build
-export LIBDIR=%{_libdir}
-export IPT_LIB_DIR=/%_lib}/xtables
+export LIBDIR=/%{_libdir}
+export IPT_LIB_DIR=/%{_lib}/xtables
+./configure
 make %{?_smp_mflags}
+make -C doc
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT/sbin \
-	$RPM_BUILD_ROOT%{_sbindir} \
-	$RPM_BUILD_ROOT%{_mandir}/man8 \
-	$RPM_BUILD_ROOT/%{_sysconfdir}/iproute2 \
-	$RPM_BUILD_ROOT%{_datadir}/tc \
-	$RPM_BUILD_ROOT%{_libdir}/tc \
-	$RPM_BUILD_ROOT%{_libdir}/iproute2 \
-	$RPM_BUILD_ROOT%{_includedir}/iproute2
-
-install -m 755 ip/ip ip/ifcfg ip/rtmon tc/tc $RPM_BUILD_ROOT/sbin
-install -m 755 misc/ss misc/nstat misc/rtacct misc/lnstat misc/arpd $RPM_BUILD_ROOT%{_sbindir}
-#netem is static
-#install -m 755 tc/q_netem.so $RPM_BUILD_ROOT%{_libdir}/tc
-#install -m 755 tc/q_atm.so $RPM_BUILD_ROOT%{_libdir}/tc
-install -m 644 netem/normal.dist netem/pareto.dist netem/paretonormal.dist $RPM_BUILD_ROOT%{_datadir}/tc
-install -m 644 man/man8/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8
-rm -r $RPM_BUILD_ROOT/%{_mandir}/man8/ss.8
-iconv -f latin1 -t utf8 < man/man8/ss.8 > $RPM_BUILD_ROOT/%{_mandir}/man8/ss.8
-install -m 755 examples/cbq.init-%{cbq_version} $RPM_BUILD_ROOT/sbin/cbq
-install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq
-
-install -m 644 lib/lib*.a $RPM_BUILD_ROOT%{_libdir}/iproute2
-install -m 644 include/*.h $RPM_BUILD_ROOT%{_includedir}/iproute2
-
-install -m 644 etc/iproute2/* $RPM_BUILD_ROOT%{_sysconfdir}/iproute2
-
-cp -f etc/iproute2/* $RPM_BUILD_ROOT/%{_sysconfdir}/iproute2
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug/*
-
-#create example avpkt file
-cat <<EOF > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq/cbq-0000.example
-DEVICE=eth0,10Mbit,1Mbit
-RATE=128Kbit
-WEIGHT=10Kbit
-PRIO=5
-RULE=192.168.1.0/24
-EOF
-
-cat <<EOF > $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cbq/avpkt
-AVPKT=3000
-EOF
+mkdir -p \
+    %{buildroot}%{_includedir} \
+    %{buildroot}/sbin \
+    %{buildroot}%{_sbindir} \
+    %{buildroot}%{_mandir}/man3 \
+    %{buildroot}%{_mandir}/man7 \
+    %{buildroot}%{_mandir}/man8 \
+    %{buildroot}%{_libdir}/tc \
+    %{buildroot}%{_sysconfdir}/iproute2 \
+    %{buildroot}%{_sysconfdir}/sysconfig/cbq
+
+for binary in \
+    ip/ifcfg \
+    ip/ip \
+    ip/rtmon \
+    tc/tc
+    do install -m755 ${binary} %{buildroot}/sbin/
+done
+
+install -m755 examples/cbq.init-%{cbq_version} %{buildroot}/sbin/cbq
+
+for binary in \
+    bridge/bridge \
+    genl/genl \
+    ip/routef \
+    ip/routel \
+    ip/rtpr \
+    misc/arpd \
+    misc/ifstat \
+    misc/lnstat \
+    misc/nstat \
+    misc/rtacct \
+    misc/ss
+    do install -m755 ${binary} %{buildroot}%{_sbindir}
+done
+
+cd %{buildroot}%{_sbindir}
+    ln -s lnstat ctstat
+    ln -s lnstat rtstat
+cd -
+
+# Libs
+install -m644 netem/*.dist %{buildroot}%{_libdir}/tc
+install -m755 tc/m_xt.so %{buildroot}%{_libdir}/tc
+cd %{buildroot}%{_libdir}/tc
+    ln -s m_xt.so m_ipt.so
+cd -
+
+# libnetlink
+install -m644 include/libnetlink.h %{buildroot}%{_includedir}
+install -m644 lib/libnetlink.a %{buildroot}%{_libdir}
+
+# Manpages
+iconv -f latin1 -t utf8 man/man8/ss.8 > man/man8/ss.8.utf8 &&
+    mv man/man8/ss.8.utf8 man/man8/ss.8
+install -m644 man/man3/*.3 %{buildroot}%{_mandir}/man3
+install -m644 man/man7/*.7 %{buildroot}%{_mandir}/man7
+install -m644 man/man8/*.8 %{buildroot}%{_mandir}/man8
+
+# Config files
+install -m644 etc/iproute2/* %{buildroot}%{_sysconfdir}/iproute2
+for config in \
+    %{SOURCE1} \
+    %{SOURCE2}
+    do install -m644 ${config} %{buildroot}%{_sysconfdir}/sysconfig/cbq
+done
 
 
 %clean
@@ -125,30 +162,36 @@ EOF
 
 
 %files
-%defattr(-,root,root,-)
 %dir %{_sysconfdir}/iproute2
-%doc README.decnet README.iproute2+tc RELNOTES README.distribution README.lnstat
-%doc iproute2-%{version}/examples
-/sbin/*
+%doc COPYING
+%doc README README.decnet README.iproute2+tc README.distribution README.lnstat
+%{_mandir}/man7/*
 %{_mandir}/man8/*
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
+/sbin/*
 %{_sbindir}/*
-%dir %{_datadir}/tc
-%{_datadir}/tc/*
 %dir %{_libdir}/tc/
-#%{_libdir}/tc/*
+%{_libdir}/tc/*
 %dir %{_sysconfdir}/sysconfig/cbq
 %config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
 
+%files doc
+%doc COPYING
+%doc doc/*.ps
+%doc examples
 
 %files devel
-%defattr(-,root,root)
-%{_libdir}/iproute2/lib*.a
-%dir %{_includedir}/iproute2
-%{_includedir}/iproute2/*.h
+%doc COPYING
+%{_mandir}/man3/*
+%{_libdir}/libnetlink.a
+%{_includedir}/libnetlink.h
 
 
 %changelog
+* Thu May 22 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.14.0-1
+- new upstream release.
+- replaced Patch100.
+
 * 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
@@ -228,14 +271,14 @@ EOF
 - clean unnecessary patches
 - add into spec *.so objects, new BR linux-atm-libs-devel
 
-* Tue Oct 31 2007 Marcela Maslanova <mmaslano@redhat.com> - 2.6.23-1
+* Wed Oct 31 2007 Marcela Maslanova <mmaslano@redhat.com> - 2.6.23-1
 - new version from upstrem 2.3.23
 
 * Tue Oct 23 2007 Marcela Maslanova <mmaslano@redhat.com> - 2.6.22-5
 - move files from /usr/lib/tc to /usr/share/tc
 - remove listing files twice
 
-* Fri Aug 30 2007 Marcela Maslanova <mmaslano@redhat.com> - 2.6.22-3
+* Thu Aug 30 2007 Marcela Maslanova <mmaslano@redhat.com> - 2.6.22-3
 - package review #225903
 
 * Mon Aug 27 2007 Jeremy Katz <katzj@redhat.com> - 2.6.22-2