|
@@ -1,27 +1,22 @@
|
|
-##%define date_version 070710
|
|
+%bcond_with tipc
|
|
%define cbq_version v0.7.3
|
|
%define cbq_version v0.7.3
|
|
|
|
|
|
Summary: Advanced IP routing and network device configuration tools
|
|
Summary: Advanced IP routing and network device configuration tools
|
|
Summary(ja): IP ルーティング,ネットワークデバイスの設定ツール
|
|
Summary(ja): IP ルーティング,ネットワークデバイスの設定ツール
|
|
Name: iproute
|
|
Name: iproute
|
|
-Version: 3.14.0
|
|
+Version: 4.1.1
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
Group: Applications/System
|
|
Group: Applications/System
|
|
-Source: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.gz
|
|
+Source: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
|
|
URL: http://kernel.org/pub/linux/utils/net/%{name}2/
|
|
URL: http://kernel.org/pub/linux/utils/net/%{name}2/
|
|
Source1: cbq-0000.example
|
|
Source1: cbq-0000.example
|
|
Source2: avpkt
|
|
Source2: avpkt
|
|
-Patch0: man-pages.patch
|
|
+
|
|
-Patch1: iproute2-3.4.0-kernel.patch
|
|
+Vendor: Project Vine
|
|
-Patch2: iproute2-3.11.0-optflags.patch
|
|
+Distribution: Vine Linux
|
|
-Patch3: iproute2-3.9.0-IPPROTO_IP_for_SA.patch
|
|
+
|
|
-Patch4: iproute2-example-cbq-service.patch
|
|
+# http://www.spinics.net/lists/netdev/msg325114.html
|
|
-Patch5: iproute2-2.6.35-print-route.patch
|
|
+Patch1: iproute2-3.19.0-docs.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
|
|
# VINE
|
|
Patch100: iproute2-3.14.0-platex.patch
|
|
Patch100: iproute2-3.14.0-platex.patch
|
|
@@ -30,8 +25,27 @@ License: GPLv2+ and Public Domain
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
BuildRequires: bison flex
|
|
BuildRequires: bison flex
|
|
BuildRequires: iptables-devel >= 1.4.10, libdb-devel
|
|
BuildRequires: iptables-devel >= 1.4.10, libdb-devel
|
|
|
|
+BuildRequires: texlive-collection-fontsrecommended
|
|
BuildRequires: texlive-collection-latexrecommended
|
|
BuildRequires: texlive-collection-latexrecommended
|
|
|
|
+BuildRequires: texlive-collection-langafrican
|
|
|
|
+BuildRequires: texlive-collection-langarabic
|
|
|
|
+BuildRequires: texlive-collection-langchinese
|
|
|
|
+BuildRequires: texlive-collection-langczechslovak
|
|
|
|
+BuildRequires: texlive-collection-langenglish
|
|
|
|
+BuildRequires: texlive-collection-langeuropean
|
|
|
|
+BuildRequires: texlive-collection-langfrench
|
|
|
|
+BuildRequires: texlive-collection-langindic
|
|
|
|
+BuildRequires: texlive-collection-langitalian
|
|
|
|
+BuildRequires: texlive-collection-langkorean
|
|
|
|
+BuildRequires: texlive-collection-langpolish
|
|
|
|
+BuildRequires: texlive-collection-langportuguese
|
|
|
|
+BuildRequires: texlive-collection-langspanish
|
|
|
|
+BuildRequires: texlive-collection-langother
|
|
BuildRequires: linuxdoc-tools pkgconfig psutils
|
|
BuildRequires: linuxdoc-tools pkgconfig psutils
|
|
|
|
+%if %{with tipc}
|
|
|
|
+BuildRequires: libmnl-devel
|
|
|
|
+%endif
|
|
|
|
+
|
|
Requires: iptables >= 1.4.10
|
|
Requires: iptables >= 1.4.10
|
|
|
|
|
|
%description
|
|
%description
|
|
@@ -65,21 +79,12 @@ Libraries, include files, etc you can use to develop iproute2.
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q -n iproute2-%{version}
|
|
%setup -q -n iproute2-%{version}
|
|
-%patch0 -p1
|
|
+%patch1 -p1 -b .doc
|
|
-%patch1 -p1 -b .kernel
|
|
|
|
-%patch2 -p1 -b .opt_flags
|
|
|
|
-%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
|
|
%patch100 -p1 -b .platex
|
|
|
|
|
|
%build
|
|
%build
|
|
|
|
+export CFLAGS="%{optflags}"
|
|
export LIBDIR=/%{_libdir}
|
|
export LIBDIR=/%{_libdir}
|
|
export IPT_LIB_DIR=/%{_lib}/xtables
|
|
export IPT_LIB_DIR=/%{_lib}/xtables
|
|
./configure
|
|
./configure
|
|
@@ -116,6 +121,9 @@ for binary in \
|
|
ip/routef \
|
|
ip/routef \
|
|
ip/routel \
|
|
ip/routel \
|
|
ip/rtpr \
|
|
ip/rtpr \
|
|
|
|
+%if %{with tipc}
|
|
|
|
+ tipc/tipc \
|
|
|
|
+%endif
|
|
misc/arpd \
|
|
misc/arpd \
|
|
misc/ifstat \
|
|
misc/ifstat \
|
|
misc/lnstat \
|
|
misc/lnstat \
|
|
@@ -188,6 +196,10 @@ done
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat May 21 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.1-1
|
|
|
|
+- new upstream release.
|
|
|
|
+- dropped all patches and imported from fc23.
|
|
|
|
+
|
|
* Thu May 22 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.14.0-1
|
|
* Thu May 22 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.14.0-1
|
|
- new upstream release.
|
|
- new upstream release.
|
|
- replaced Patch100.
|
|
- replaced Patch100.
|