|
@@ -1,13 +1,14 @@
|
|
|
%bcond_with tipc
|
|
|
+%bcond_with texdoc
|
|
|
%define cbq_version v0.7.3
|
|
|
|
|
|
Summary: Advanced IP routing and network device configuration tools
|
|
|
Summary(ja): IP ルーティング,ネットワークデバイスの設定ツール
|
|
|
Name: iproute
|
|
|
-Version: 4.1.1
|
|
|
+Version: 4.14.1
|
|
|
Release: 1%{?_dist_release}
|
|
|
Group: Applications/System
|
|
|
-Source: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
|
|
|
+Source: https://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
|
|
@@ -25,6 +26,8 @@ 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: pkgconfig
|
|
|
+%if %{with texdoc}
|
|
|
BuildRequires: texlive-collection-fontsrecommended
|
|
|
BuildRequires: texlive-collection-latexrecommended
|
|
|
BuildRequires: texlive-collection-langafrican
|
|
@@ -41,7 +44,8 @@ BuildRequires: texlive-collection-langpolish
|
|
|
BuildRequires: texlive-collection-langportuguese
|
|
|
BuildRequires: texlive-collection-langspanish
|
|
|
BuildRequires: texlive-collection-langother
|
|
|
-BuildRequires: linuxdoc-tools pkgconfig psutils
|
|
|
+BuildRequires: linuxdoc-tools psutils
|
|
|
+%endif
|
|
|
%if %{with tipc}
|
|
|
BuildRequires: libmnl-devel
|
|
|
%endif
|
|
@@ -79,9 +83,10 @@ Libraries, include files, etc you can use to develop iproute2.
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n iproute2-%{version}
|
|
|
+%if %{with texdoc}
|
|
|
%patch1 -p1 -b .doc
|
|
|
-
|
|
|
%patch100 -p1 -b .platex
|
|
|
+%endif
|
|
|
|
|
|
%build
|
|
|
export CFLAGS="%{optflags}"
|
|
@@ -89,7 +94,9 @@ export LIBDIR=/%{_libdir}
|
|
|
export IPT_LIB_DIR=/%{_lib}/xtables
|
|
|
./configure
|
|
|
make %{?_smp_mflags}
|
|
|
-make -C doc
|
|
|
+%if %{with texdoc}
|
|
|
+#make -C doc
|
|
|
+%endif
|
|
|
|
|
|
%install
|
|
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
|
@@ -102,7 +109,7 @@ mkdir -p \
|
|
|
%{buildroot}%{_mandir}/man7 \
|
|
|
%{buildroot}%{_mandir}/man8 \
|
|
|
%{buildroot}%{_libdir}/tc \
|
|
|
- %{buildroot}%{_sysconfdir}/iproute2 \
|
|
|
+ %{buildroot}%{_sysconfdir}/iproute2/{rt_protos.d,rt_tables.d} \
|
|
|
%{buildroot}%{_sysconfdir}/sysconfig/cbq
|
|
|
|
|
|
for binary in \
|
|
@@ -157,7 +164,14 @@ 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 f in `find etc/iproute2/ -maxdepth 1 -type f`;
|
|
|
+ do install -m644 $f %{buildroot}%{_sysconfdir}/iproute2
|
|
|
+done
|
|
|
+
|
|
|
+install -m644 etc/iproute2/rt_protos.d/* %{buildroot}%{_sysconfdir}/iproute2/rt_protos.d/
|
|
|
+
|
|
|
+install -m644 etc/iproute2/rt_tables.d/* %{buildroot}%{_sysconfdir}/iproute2/rt_tables.d/
|
|
|
+
|
|
|
for config in \
|
|
|
%{SOURCE1} \
|
|
|
%{SOURCE2}
|
|
@@ -171,11 +185,23 @@ done
|
|
|
|
|
|
%files
|
|
|
%dir %{_sysconfdir}/iproute2
|
|
|
+%dir %{_sysconfdir}/iproute2/rt_protos.d
|
|
|
+%dir %{_sysconfdir}/iproute2/rt_tables.d
|
|
|
%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/*
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/bpf_pinning
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/ematch_map
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/group
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/nl_protos
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_dsfield
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_protos
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_realms
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_scopes
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_tables
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_protos.d/*
|
|
|
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_tables.d/*
|
|
|
/sbin/*
|
|
|
%{_sbindir}/*
|
|
|
%dir %{_libdir}/tc/
|
|
@@ -185,7 +211,7 @@ done
|
|
|
|
|
|
%files doc
|
|
|
%doc COPYING
|
|
|
-%doc doc/*.ps
|
|
|
+%doc doc/*
|
|
|
%doc examples
|
|
|
|
|
|
%files devel
|
|
@@ -196,6 +222,10 @@ done
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Dec 01 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.14.1-1
|
|
|
+- new upstream release.
|
|
|
+- dropped TeX docs.
|
|
|
+
|
|
|
* 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.
|