commit iproute2 for openSUSE:Factory
Hello community,
here is the log from the commit of package iproute2 for openSUSE:Factory
checked in at Mon Jun 6 10:35:49 CEST 2011.
--------
--- iproute2/iproute2.changes 2011-05-30 13:51:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/iproute2/iproute2.changes 2011-06-01 01:29:07.000000000 +0200
@@ -1,0 +2,9 @@
+Tue May 31 21:35:16 UTC 2011 - jengelh@medozas.de
+
+- Correct installation path of tc modules
+- Restore symbol lookup in m_xt.so (bnc#679172)
+- Add patches to make m_xt build with libxtables6
+- Restore m_xt's module lookup (bnc#660554)
+- Run spec-beautifier
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
iproute2-libxtables6.diff
iproute2-xt.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ iproute2.spec ++++++
--- /var/tmp/diff_new_pack.9dzGQr/_old 2011-06-06 10:30:52.000000000 +0200
+++ /var/tmp/diff_new_pack.9dzGQr/_new 2011-06-06 10:30:52.000000000 +0200
@@ -23,7 +23,7 @@
Group: Productivity/Networking/Routing
Provides: iproute
Version: 2.6.38
-Release: 2
+Release: 5
%define rversion 2.6.38
Summary: Advanced Routing
Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
@@ -32,10 +32,11 @@
Patch1: %name-HZ.diff
Patch2: %name-pdfdoc.diff
Patch3: %name-memleak.diff
+Patch4: iproute2-xt.diff
+Patch5: iproute2-libxtables6.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
+%define with_xt 1
%if 0%{?with_xt}
BuildRequires: iptables-devel
%endif
@@ -78,50 +79,51 @@
%patch1
%patch2
%patch3
+%patch -P 4 -P 5 -p1
find . -name *.orig -print0 | xargs -r0 rm -v
%build
# build with -fPIC. For details see
# https://bugzilla.novell.com/show_bug.cgi?id=388021
-make %{?_smp_mflags} LIBDIR=%_libdir CCOPTS="-D_GNU_SOURCE $RPM_OPT_FLAGS -Wstrict-prototypes -fPIC"
+xtlibdir="$(pkg-config xtables --variable=xtlibdir)";
+make %{?_smp_mflags} LIBDIR=%_libdir CCOPTS="-D_GNU_SOURCE %optflags -Wstrict-prototypes -fPIC -DXT_LIB_DIR=\\\"$xtlibdir\\\""
cd doc
make pdf
%install
-install -d $RPM_BUILD_ROOT/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}}
-install -d $RPM_BUILD_ROOT/{/usr/include,%_libdir,/usr/share}
-make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%_libdir \
- MODDESTDIR="$RPM_BUILD_ROOT/%_libdir"
-rm -f "$RPM_BUILD_ROOT/%_libdir/m_ipt.so"
-install lib/libnetlink.a $RPM_BUILD_ROOT/%_libdir
-install include/libnetlink.h $RPM_BUILD_ROOT/usr/include
-mv $RPM_BUILD_ROOT/usr/sbin/ip $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT/bin
-ln -sf /sbin/ip $RPM_BUILD_ROOT/bin/ip
-rm $RPM_BUILD_ROOT/usr/sbin/ifcfg
+install -d %buildroot/{etc/,sbin/,usr/{sbin,share/man/man{3,8}}}
+install -d %buildroot/{/usr/include,%_libdir,/usr/share}
+make install DESTDIR=%buildroot LIBDIR=%_libdir \
+ MODDESTDIR="%buildroot/%_libdir/tc"
+# We have m_xt
+rm -f "%buildroot/%_libdir/tc/m_ipt.so"
+install lib/libnetlink.a %buildroot/%_libdir
+install include/libnetlink.h %buildroot%_includedir
+mv %buildroot%_sbindir/ip %buildroot/sbin
+mkdir -p %buildroot/bin
+ln -sf /sbin/ip %buildroot/bin/ip
+rm %buildroot%_sbindir/ifcfg
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %buildroot
%files
%defattr(-,root,root)
%doc README* RELNOTES
-/usr/sbin/*
+%_sbindir/*
/sbin/*
/bin/ip
%_mandir/man8/*
-%dir /etc/iproute2
-%config(noreplace) /etc/iproute2/rt_dsfield
-%config(noreplace) /etc/iproute2/rt_protos
-%config(noreplace) /etc/iproute2/rt_scopes
-%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/*
+%dir %_sysconfdir/iproute2
+%config(noreplace) %_sysconfdir/iproute2/rt_dsfield
+%config(noreplace) %_sysconfdir/iproute2/rt_protos
+%config(noreplace) %_sysconfdir/iproute2/rt_scopes
+%config(noreplace) %_sysconfdir/iproute2/rt_realms
+%config(noreplace) %_sysconfdir/iproute2/rt_tables
+%config(noreplace) %_sysconfdir/iproute2/ematch_map
+%_libdir/tc
+%dir %_datadir/tc
+%attr(644,root,root)%_datadir/tc/*
%files doc
%defattr(-,root,root)
@@ -131,7 +133,7 @@
%files -n libnetlink-devel
%defattr(-,root,root)
-/usr/include/*
+%_includedir/*
%_mandir/man3/libnetlink*
%_libdir/lib*
++++++ iproute2-libxtables6.diff ++++++
From: Jan Engelhardt
participants (1)
-
root@hilbert.suse.de