- up to 2.6.16

[packages/iproute2.git] / iproute2.spec

diff --git a/iproute2.spec b/iproute2.spec
index 674859f72dc65dac73807dda21f3d9ac17922de2..69f2731c668fbb7d87bc8e840481bab7c1343012 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -1,43 +1,43 @@
 #
 # 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
 Summary(pt_BR):        Ferramentas para roteamento avançado e configuração de interfaces de rede
 Name:          iproute2
-%define        sdate   050207
+%define        sdate   060323
 # do not use ,,2.6.X'' as version here, put whole number like 2.6.8
-Version:       2.6.10
-Release:       0.2
+Version:       2.6.16
+Release:       1
 License:       GPL
 Vendor:                Stephen Hemminger <shemminger@osdl.org>
 Group:         Networking/Admin
-#Source0:      http://developer.osdl.org/dev/iproute2/download/%{name}-%{version}-ss%{sdate}.tar.gz
-Source0:       http://developer.osdl.org/dev/iproute2/download/%{name}-%{sdate}.tar.gz
-# Source0-md5: 6aa78a4272d16053c2266e52656f4b49
-Patch0:         %{name}-build.patch
+Source0:       http://developer.osdl.org/dev/iproute2/download/%{name}-%{version}-%{sdate}.tar.gz
+# Source0-md5: f31d4516b35bbfeaa72c762f5959e97c
+Patch0:                %{name}-build.patch
 Patch1:                %{name}-arp.patch
+Patch2:                %{name}-lex.patch
+Patch3:                %{name}-iptables.patch
+Patch4:                %{name}-iptables64.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/
+Patch10:       %{name}-2.2.4-wrr.patch
+Patch11:       esfq-%{name}.patch
+URL:           http://linux-net.osdl.org/index.php/Iproute2
 BuildRequires: bison
 BuildRequires: db-devel
+BuildRequires: flex
 %if %{with atm}
 BuildRequires: linux-atm-devel
 %endif
-BuildRequires: linux-libc-headers >= 7:2.6.10.0-2
+BuildRequires: linux-libc-headers >= 7:2.6.12.0-13
 %if %{with doc}
 BuildRequires: psutils
 BuildRequires: sgml-tools
@@ -55,10 +55,10 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _sysconfdir     /etc/iproute2
 
 %description
-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.
+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.
 
 %description -l es
 Linux mantiene compatibilidad con los utilitarios estándares de
@@ -89,21 +89,23 @@ Ta biblioteka udost
 a przestrzeni± u¿ytkownika.
 
 %prep
-%setup -q -n %{name}-%{sdate}
-rm -rf include-glibc
+%setup -q -n %{name}-%{version}-%{sdate}
+rm -rf include-glibc include/linux
 %patch0 -p1
 %patch1 -p1
-
+%patch2 -p1
+%ifarch "%{_lib}" == "lib64"
+%patch4 -p1
+%else
+%patch3 -p1
+%endif
 %patch10 -p1
 %patch11 -p1
-%{?with_iec_complaint:%patch13 -p1}
 
 %build
-rm -rf include/linux
-
 %{__make} \
        %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"}%{!?with_uClibc:CC="%{__cc}"} \
-       OPT="%{rpmcflags} -DCONFIG_CLS_U32_PERF=1" \
+       OPT="%{rpmcflags}" \
        %{!?with_tc:SUBDIRS="lib ip misc" LDFLAGS="%{rpmldflags}"}
 
 %{?with_doc:%{__make} -C doc}
@@ -131,10 +133,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README README.iproute2+tc RELNOTES %{?with_doc:doc/*.ps}
+%doc README README.decnet README.iproute2+tc README.lnstat RELNOTES
+%doc ChangeLog %{?with_doc:doc/*.ps}
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %{_mandir}/man8/*
 
 %files -n libnetlink-devel