Browse Source

iproute-4.1.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10300 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 8 years ago
parent
commit
7e54406a26
1 changed files with 37 additions and 25 deletions
  1. 37 25
      i/iproute/iproute-vl.spec

+ 37 - 25
i/iproute/iproute-vl.spec

@@ -1,27 +1,22 @@
-##%define date_version 070710
+%bcond_with tipc
 %define cbq_version v0.7.3
 
 Summary: Advanced IP routing and network device configuration tools
 Summary(ja): IP ルーティング,ネットワークデバイスの設定ツール
 Name: iproute
-Version: 3.14.0
+Version: 4.1.1
 Release: 1%{?_dist_release}
 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/
 Source1: cbq-0000.example
 Source2: avpkt
-Patch0: man-pages.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
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
+# http://www.spinics.net/lists/netdev/msg325114.html
+Patch1:             iproute2-3.19.0-docs.patch
 
 # VINE
 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)
 BuildRequires: bison flex
 BuildRequires: iptables-devel >= 1.4.10, libdb-devel
+BuildRequires: texlive-collection-fontsrecommended
 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
+%if %{with tipc}
+BuildRequires: libmnl-devel
+%endif
+
 Requires: iptables >= 1.4.10
 
 %description
@@ -65,21 +79,12 @@ Libraries, include files, etc you can use to develop iproute2.
 
 %prep
 %setup -q -n iproute2-%{version}
-%patch0 -p1
-%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
+%patch1 -p1 -b .doc
 
 %patch100 -p1 -b .platex
 
 %build
+export CFLAGS="%{optflags}"
 export LIBDIR=/%{_libdir}
 export IPT_LIB_DIR=/%{_lib}/xtables
 ./configure
@@ -116,6 +121,9 @@ for binary in \
     ip/routef \
     ip/routel \
     ip/rtpr \
+%if %{with tipc}
+    tipc/tipc \
+%endif
     misc/arpd \
     misc/ifstat \
     misc/lnstat \
@@ -188,6 +196,10 @@ done
 
 
 %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
 - new upstream release.
 - replaced Patch100.