- rel 11 for ac

[packages/iproute2.git] / iproute2.spec

diff --git a/iproute2.spec b/iproute2.spec
index b3e6be32953743f788decfd4af689e6831cda511..644955db39170307470409b7c0550477b06af6ca 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,14 +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
@@ -29,6 +31,7 @@ Patch5:               %{name}-htb2_tc.patch
 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}
 BuildRequires: bison
 %{!?_without_tetex:BuildRequires:      latex2html}
@@ -36,6 +39,7 @@ BuildRequires:        bison
 %{!?_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)
 
@@ -90,10 +94,11 @@ a przestrzeni
 %endif
 %patch6 -p1
 %patch8 -p1
+%{!?_without_tc_esfq:%patch9 -p1}
 
 %build
 WRRDEF=""
-grep -q tc_wrr_class_weight /usr/include/linux/pkt_sched.h || WRRDEF="-DNEED_WRR_DEFS"
+grep -q tc_wrr_class_weight %{_kernelsrcdir}/include/linux/pkt_sched.h || WRRDEF="-DNEED_WRR_DEFS"
 
 %{__make} \
        CC="%{__cc}" \
@@ -121,8 +126,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}/*
@@ -130,5 +134,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libnetlink-devel
 %defattr(644,root,root,755)
-%{_libdir}/*
-%{_includedir}/*
+%{_libdir}/lib*.a
+%{_includedir}/*.h