-# conditional build
-# --without tetex # with tetex-2 there shuld be BR tetex-tex-babel
-# --without tc (don't build tc program, it break static linkage)
-# --without dist_kernel
-
-%define _kernel24 %(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
-%define mainver 2.4.7
-%define snapshot ss020116
-Summary: Utility to control Networking behavior in 2.2.X kernels
+#
+# TODO:
+# - fix build @ uClibc
+# - remove -DCONFIG_CLS_U32_PERF=1 when llh will be fixed
+#
+# Conditional build
+%bcond_without doc # don't build documentation
+%bcond_without tc # don't build tc program (it breaks static linkage)
+%bcond_without atm # don't required ATM.
+%bcond_with uClibc # do some hacks to build with uClibc
+%bcond_with iec_complaint # fix bitrate calculations
+#
+Summary: Utility to control Networking behavior in.X kernels
Summary(es): Herramientas para encaminamiento avanzado y configuración de interfaces de red
-Summary(pl): Narzêdzie do kontrolowania Sieci w kernelach 2.2
+Summary(pl): Narzêdzie do kontrolowania Sieci w kernelach
Summary(pt_BR): Ferramentas para roteamento avançado e configuração de interfaces de rede
Name: iproute2
-Version: %{mainver}.%{snapshot}
-%define _rel 10
-Release: %{_rel}@%{_kernel_ver_str}
+%define sdate 050124
+# do not use ,,2.6.X'' as version here, put whole number like 2.6.8
+Version: 2.6.10
+Release: 0.1
License: GPL
-Vendor: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
+Vendor: Stephen Hemminger <shemminger@osdl.org>
Group: Networking/Admin
-Source0: ftp://ftp.inr.ac.ru/ip-routing/%{name}-%{mainver}-now-%{snapshot}.tar.gz
-Source1: %{name}-owl-man.tar.bz2
-Patch0: %{name}-make.patch
-Patch1: %{name}-uClibc.patch
-Patch2: %{name}-fix-2_2.patch
-Patch3: %{name}-label.patch
-Patch4: %{name}-latest.patch
-Patch5: %{name}-htb2_tc.patch
-Patch6: wrr-iproute2-2.2.4.patch
-Patch7: htb3.6_tc.patch
-Patch8: %{name}-no_libresolv.patch
-BuildRequires: db-devel
+Source0: http://developer.osdl.org/dev/iproute2/download/%{name}-%{version}-ss%{sdate}.tar.gz
+# Source0-md5: 7ae2bab0858766d61d7e92670cc2e622
+Patch0: %{name}-build.patch
+Patch1: %{name}-arp.patch
+# extensions
+Patch10: %{name}-2.2.4-wrr.patch
+Patch11: %{name}-2.2.4-esfq.patch
+Patch13: %{name}-rates-1024-fix.patch
+URL: http://developer.osdl.org/dev/iproute2/
BuildRequires: bison
-%{!?_without_tetex:BuildRequires: latex2html}
-%{!?_without_tetex:BuildRequires: psutils}
-%{!?_without_tetex:BuildRequires: sgml-tools}
-%{!?_without_tetex:BuildRequires: tetex-dvips}
-%{!?_without_tetex:BuildRequires: tetex-latex}
+BuildRequires: db-devel
+%if %{with atm}
+BuildRequires: linux-atm-devel
+%endif
+BuildRequires: linux-libc-headers >= 7:2.6.10.0-2
+%if %{with doc}
+BuildRequires: psutils
+BuildRequires: sgml-tools
+BuildRequires: tetex-dvips
+BuildRequires: tetex-fonts-jknappen
+BuildRequires: tetex-format-latex
+BuildRequires: tetex-metafont
+BuildRequires: tetex-tex-babel
+%endif
Obsoletes: iproute
+Obsoletes: ifstat
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
%define _sysconfdir /etc/iproute2
%description
-Linux 2.2 maintains compatibility with the basic configuration
+Linux maintains compatibility with the basic configuration
utilities of the network (ifconfig, route) but a new utility is
required to exploit the new characteristics and features of the
kernel. This package includes the new utilities.
a przestrzeni± u¿ytkownika.
%prep
-%setup -q -n %{name} -a1
+%setup -q -n %{name}-%{sdate}
+rm -rf include-glibc
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-#%%patch3 -p1
-#%%patch4 -p1
-%if %{_kernel24}
-%patch7 -p1
-%else
-%patch5 -p1
-%endif
-%patch6 -p1
-%patch8 -p1
+
+%patch10 -p1
+%patch11 -p1
+%{?with_iec_complaint:%patch13 -p1}
%build
-WRRDEF=""
-grep -q tc_wrr_class_weight /usr/include/linux/pkt_sched.h || WRRDEF="-DNEED_WRR_DEFS"
+rm -rf include/linux
%{__make} \
- CC="%{__cc}" \
- OPT="%{rpmcflags} ${WRRDEF}" \
- KERNEL_INCLUDE="%{_kernelsrcdir}/include" \
- %{?_without_tc:SUBDIRS="lib ip" LDFLAGS="%{rpmldflags}"}
-%{!?_without_tetex:%{__make} -C doc}
+ %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"}%{!?with_uClibc:CC="%{__cc}"} \
+ OPT="%{rpmcflags} -DCONFIG_CLS_U32_PERF=1" \
+ %{!?with_tc:SUBDIRS="lib ip misc" LDFLAGS="%{rpmldflags}"}
+
+%{?with_doc:%{__make} -C doc}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},%{_mandir}/man8,%{_libdir},%{_includedir}}
-install ip/{ip,rtmon,routel} %{!?_without_tc:tc/tc} $RPM_BUILD_ROOT%{_sbindir}
+install ip/{ip,rtmon,routel} %{?with_tc:tc/tc} misc/{ifstat,lnstat,nstat,rtacct,ss} $RPM_BUILD_ROOT%{_sbindir}
install etc/iproute2/rt_protos \
etc/iproute2/rt_realms \
etc/iproute2/rt_scopes \
etc/iproute2/rt_tables \
$RPM_BUILD_ROOT%{_sysconfdir}
-install man/* $RPM_BUILD_ROOT%{_mandir}/man8
+
+install man/man8/* $RPM_BUILD_ROOT%{_mandir}/man8
+echo ".so tc-pbfifo.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tc-bfifo.8
+echo ".so tc-pbfifo.8" > $RPM_BUILD_ROOT%{_mandir}/man8/tc-pfifo.8
+
install lib/libnetlink.a $RPM_BUILD_ROOT%{_libdir}
install include/libnetlink.h $RPM_BUILD_ROOT%{_includedir}
%files
%defattr(644,root,root,755)
-%doc README README.iproute2+tc RELNOTES
-%{!?_without_tetex:%doc doc/*.ps}
+%doc README README.iproute2+tc RELNOTES %{?with_doc:doc/*.ps}
%attr(755,root,root) %{_sbindir}/*
%dir %{_sysconfdir}
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*
%files -n libnetlink-devel
%defattr(644,root,root,755)
-%{_libdir}/*
-%{_includedir}/*
+%{_libdir}/lib*.a
+%{_includedir}/*.h
projects / packages / iproute2.git / blobdiff