diff --git a/iproute.spec b/iproute.spec index 4823fa4..e989caf 100644 --- a/iproute.spec +++ b/iproute.spec @@ -3,8 +3,8 @@ %define pckdocdir %{_datadir}/doc/iproute-%{version} Name: iproute -Version: 4.0.0 -Release: 2mamba +Version: 4.15.0 +Release: 1mamba Summary: Advanced routing tools including ipv6 routing Group: Network/Routing Vendor: openmamba @@ -33,7 +33,7 @@ BuildRequires: tetex-dvips BuildRequires: linuxdoc-tools BuildRequires: linuxdoc-tools-latex %endif -BuildRequires: iptables >= 1.6 +BuildRequires: iptables >= 1.6.2 BuildRequires: bison BuildRequires: flex Provides: iproute2 = %{?epoch:%epoch:}%{version}-%{release} @@ -55,7 +55,7 @@ This package contain the iproute2 documentation in dvi and html formats. #%patch1 -p1 -b .makefile #%patch2 -p1 -b .ip_resolve_crash #%patch3 -p1 -b .tc_pfifo_man -%patch4 -p1 +#%patch4 -p1 %patch5 -p1 #%patch6 -p1 @@ -71,9 +71,9 @@ This package contain the iproute2 documentation in dvi and html formats. LIBDIR=%{_libdir} %endif -%if "%{stage1}" != "1" -%make -C doc dvi html -%endif +#%if "%{stage1}" != "1" +#% make -C doc dvi html +#%endif %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -83,10 +83,10 @@ This package contain the iproute2 documentation in dvi and html formats. DOCDIR=%{pckdocdir} \ LIBDIR=%{_libdir} -install -D -m 0755 %{S:1} \ - %{buildroot}%{_initrddir}/tc -install -D -m 0644 %{S:2} \ - %{buildroot}%{_sysconfdir}/sysconfig/traffic_control +#install -D -m 0755 %{S:1} \ +# %{buildroot}%{_initrddir}/tc +#install -D -m 0644 %{S:2} \ +# %{buildroot}%{_sysconfdir}/sysconfig/traffic_control install -d %{buildroot}/sbin mv %{buildroot}%{_sbindir}/ip %{buildroot}/sbin @@ -101,31 +101,31 @@ rm -f %{buildroot}%{pckdocdir}/*.sgml %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%preun -if [ $1 -eq 0 ]; then -# erase - /sbin/chkconfig tc - if [ $? -eq 0 ]; then - /sbin/service tc stop - /sbin/chkconfig --del tc - fi -fi -exit 0 +#% preun +#if [ $1 -eq 0 ]; then +## erase +# /sbin/chkconfig tc +# if [ $? -eq 0 ]; then +# /sbin/service tc stop +# /sbin/chkconfig --del tc +# fi +#fi +#exit 0 -%postun -if [ $1 -eq 1 ]; then -# upgrade - /sbin/chkconfig tc - [ $? -eq 0 ] && /sbin/service tc restart -fi -exit 0 +#% postun +#if [ $1 -eq 1 ]; then +## upgrade +# /sbin/chkconfig tc +# [ $? -eq 0 ] && /sbin/service tc restart +#fi +#exit 0 %files %defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/sysconfig/traffic_control +#%config(noreplace) %{_sysconfdir}/sysconfig/traffic_control %dir %{_sysconfdir}/iproute2 %config %{_sysconfdir}/iproute2/* -%{_initrddir}/tc +#%{_initrddir}/tc /sbin/ifcfg /sbin/ip /sbin/tc @@ -134,15 +134,18 @@ exit 0 %{_sbindir}/bridge %{_sbindir}/ctstat %{_sbindir}/genl +%{_sbindir}/devlink %{_sbindir}/ifstat %{_sbindir}/lnstat %{_sbindir}/nstat +%{_sbindir}/rdma %{_sbindir}/routef %{_sbindir}/routel %{_sbindir}/rtacct %{_sbindir}/rtpr %{_sbindir}/rtstat %{_sbindir}/ss +%{_sbindir}/tipc %dir %{_libdir}/tc %{_libdir}/tc/m_ipt.so %{_libdir}/tc/m_xt.so @@ -152,21 +155,29 @@ exit 0 %{_libdir}/tc/pareto.dist %{_libdir}/tc/paretonormal.dist #%{_libdir}/tc/q_atm.so +%{_includedir}/iproute2/bpf_elf.h +%{_datadir}/bash-completion/completions/tc %{_mandir}/man3/libnetlink.* %{_mandir}/man7/tc-hfsc.7* %{_mandir}/man8/* %doc COPYING -%if "%{stage1}" != "1" -%files doc -%defattr(-,root,root) -%doc doc/*.dvi -%doc doc/*.html -%doc README -%doc examples/ -%endif +#%if "%{stage1}" != "1" +#%files doc +#%defattr(-,root,root) +#%doc doc/*.dvi +#%doc doc/*.html +#%doc README +#%doc examples/ +#%endif %changelog +* Fri Feb 09 2018 Silvan Calarco 4.15.0-1mamba +- update to 4.15.0 + +* Fri Feb 09 2018 Silvan Calarco 4.0.0-3mamba +- rebuilt with iptables 1.6.2 + * Tue Feb 09 2016 Silvan Calarco 4.0.0-2mamba - rebuilt with iptables 1.6.0