- new (enable diffserv; use userspace headers)

[packages/iproute2.git] / iproute2.spec

diff --git a/iproute2.spec b/iproute2.spec
index eb083cbc9b47b5fa4f2c32189226e709373d8426..403f091cfb591f37c6cdcc39fd42ecee53539702 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -1,8 +1,9 @@
-# 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
-
+#
+# Conditional build
+# _without_tetex       - don't build documentation
+# _without_tc          - don't build tc program (it breaks static linkage)
+# _without_tc_esfq     - build tc without esfq support (requires patched headers)
+#
 %define                _kernel24       %(echo %{_kernel_ver} | grep -q '2\.[012]\.' ; echo $?)
 %define mainver                2.4.7
 %define snapshot       ss020116
@@ -12,15 +13,15 @@ Summary(pl):        Narz
 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 _rel    11
+Release:       %{_rel}@%{_kernel_ver_str}
 License:       GPL
 Vendor:                Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
 Group:         Networking/Admin
 Source0:       ftp://ftp.inr.ac.ru/ip-routing/%{name}-%{mainver}-now-%{snapshot}.tar.gz
 # Source0-md5: 2c7e5f3a10e703745ecdc613f7a7d187
 Source1:       %{name}-owl-man.tar.bz2
-# Source1-md5: cd4425df972a4ab001db31a5eb1c5da5
+# Source1-md5: cd4425df972a4ab001db31a5eb1c5da5
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-uClibc.patch
 Patch2:                %{name}-fix-2_2.patch
@@ -31,13 +32,17 @@ Patch6:             wrr-iproute2-2.2.4.patch
 Patch7:                htb3.6_tc.patch
 Patch8:                %{name}-no_libresolv.patch
 Patch9:                %{name}-2.2.4-now-ss001007-esfq.diff
-%{!?_without_tc:BuildRequires: db-devel}
+Patch10:       %{name}-stats.patch
+Patch11:       %{name}-disable_arpd.patch
+Patch100:      %{name}-2.6.0-t7-test.patch
+
 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}
+%{!?_without_tetex:BuildRequires:      tetex-tex-babel}
 Obsoletes:     iproute
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -87,12 +92,16 @@ a przestrzeni
 #%%patch4 -p1
 %if %{_kernel24}
 %patch7 -p1
+%patch10 -p1
 %else
 %patch5 -p1
 %endif
 %patch6 -p1
 %patch8 -p1
-%patch9 -p1
+%{!?_without_tc_esfq:%patch9 -p1}
+%patch11 -p1
+
+#%patch100 -p1
 
 %build
 WRRDEF=""
@@ -102,14 +111,15 @@ grep -q tc_wrr_class_weight %{_kernelsrcdir}/include/linux/pkt_sched.h || WRRDEF
        CC="%{__cc}" \
        OPT="%{rpmcflags} ${WRRDEF}" \
        KERNEL_INCLUDE="%{_kernelsrcdir}/include" \
-       %{?_without_tc:SUBDIRS="lib ip" LDFLAGS="%{rpmldflags}"}
+       LDFLAGS="%{rpmldflags}" \
+       %{?_without_tc:SUBDIRS="lib ip misc"}
 %{!?_without_tetex:%{__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} %{!?_without_tc:tc/tc} misc/{rtacct,rtstat} $RPM_BUILD_ROOT%{_sbindir}
 install etc/iproute2/rt_protos \
        etc/iproute2/rt_realms \
        etc/iproute2/rt_scopes \
@@ -124,8 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README README.iproute2+tc RELNOTES
-%{!?_without_tetex:%doc doc/*.ps}
+%doc README README.iproute2+tc RELNOTES %{!?_without_tetex:doc/*.ps}
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*
@@ -133,5 +142,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libnetlink-devel
 %defattr(644,root,root,755)
-%{_libdir}/*
-%{_includedir}/*
+%{_libdir}/lib*.a
+%{_includedir}/*.h