- added iproute2-match-nfmark-in-u32.patch

[packages/iproute2.git] / iproute2.spec

diff --git a/iproute2.spec b/iproute2.spec
index 34d1a11bb0c620be41e83c0eeaeb603c7d80a56d..381eab2a064f0ebd0980eaa6cea1794682ae6c31 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -1,10 +1,12 @@
 #
 # 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
 #
@@ -13,25 +15,29 @@ Summary(es):        Herramientas para encaminamiento avanzado y configuraci
 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   040702
+%define        sdate   041019
 # do not use ,,2.6.X'' as version here, put whole number like 2.6.8
-Version:       2.6.8
-Release:       3
+Version:       2.6.9
+Release:       0.1
 License:       GPL
 Vendor:                Stephen Hemminger <shemminger@osdl.org>
 Group:         Networking/Admin
-Source0:       http://developer.osdl.org/dev/iproute2/download/%{name}-2.6.X-ss%{sdate}.tar.gz
-# Source0-md5: cecf5ee39e8d9033ad0a6f6af274cdab
+Source0:       http://developer.osdl.org/dev/iproute2/download/%{name}-%{version}-%{sdate}.tar.gz
+# Source0-md5: 4b3f335b0139cb909c6a2ae8bf72e548
 Patch0:         %{name}-build.patch
-Patch2:                %{name}-arp.patch
-Patch4:         %{name}-ipaddress.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
+Patch14:        %{name}-match-nfmark-in-u32.patch
 URL:           http://developer.osdl.org/dev/iproute2/
 BuildRequires: bison
-BuildRequires: linux-libc-headers >= 7:2.6.7.0-8
+BuildRequires: db-devel
+%if %{with atm}
+BuildRequires: linux-atm-devel
+%endif
+BuildRequires: linux-libc-headers >= 7:2.6.7.0-9
 %if %{with doc}
 BuildRequires: psutils
 BuildRequires: sgml-tools
@@ -86,17 +92,19 @@ a przestrzeni
 %setup -q
 rm -rf include-glibc
 %patch0 -p1
-%patch2 -p1
-%patch4 -p1
+%patch1 -p1
 
 %patch10 -p1
 %patch11 -p1
 %{?with_iec_complaint:%patch13 -p1}
+%patch14 -p1
 
 %build
+rm -rf include/linux
+
 %{__make} \
        %{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"}%{!?with_uClibc:CC="%{__cc}"} \
-       OPT="%{rpmcflags}" \
+       OPT="%{rpmcflags} -DCONFIG_CLS_U32_PERF=1" \
        %{!?with_tc:SUBDIRS="lib ip misc" LDFLAGS="%{rpmldflags}"}
 
 %{?with_doc:%{__make} -C doc}
@@ -105,7 +113,7 @@ rm -rf include-glibc
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir},%{_mandir}/man8,%{_libdir},%{_includedir}}
 
-install ip/{ip,rtmon,routel} %{?with_tc:tc/tc} misc/{rtacct,rtstat,ss,ifstat} $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 \