From 14821d810a5be85456acda7a834c33f1c053fcae36de0939f1fdd97e822e9e79 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 30 May 2011 11:51:21 +0000 Subject: [PATCH] Deactivate m_xt OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=25 --- iproute2.changes | 6 ++++++ iproute2.spec | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/iproute2.changes b/iproute2.changes index 4436d05..fb6c7cc 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 30 11:50:56 UTC 2011 - jengelh@medozas.de + +- Disable building m_xt.so which has not been updated for + iptables 1.4.11 + ------------------------------------------------------------------- Wed Mar 23 18:57:20 UTC 2011 - bphilips@novell.com diff --git a/iproute2.spec b/iproute2.spec index fc75bfb..1564be3 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -19,8 +19,6 @@ Name: iproute2 -BuildRequires: bison db-devel flex ghostscript-fonts-std ghostscript-x11 libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel -BuildRequires: iptables-devel License: GPLv2+ Group: Productivity/Networking/Routing Provides: iproute @@ -35,6 +33,12 @@ Patch1: %name-HZ.diff Patch2: %name-pdfdoc.diff Patch3: %name-memleak.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: bison db-devel flex ghostscript-fonts-std ghostscript-x11 libpng-devel libtiff-devel sgmltool texlive-latex xorg-x11-devel +# iproute2 not adapted for iptables 1.4.11 +%define with_xt 0 +%if 0%{?with_xt} +BuildRequires: iptables-devel +%endif %description This package provides the tools ip, tc, and rtmon needed to use the new @@ -113,7 +117,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/iproute2/rt_realms %config(noreplace) /etc/iproute2/rt_tables %config(noreplace) /etc/iproute2/ematch_map +%if 0%{?with_xt} %_libdir/m_xt.so +%endif %dir /usr/share/tc %attr(644,root,root)/usr/share/tc/*