diff --git a/iproute2.changes b/iproute2.changes index 30416b7..7b381aa 100644 --- a/iproute2.changes +++ b/iproute2.changes @@ -11,6 +11,7 @@ Tue Jan 11 00:45:02 UTC 2011 - jengelh@medozas.de - Spec file updates * Remove pointless AutoReqProv:on (that's the default) * Provide iproute symbol with full version +* Enable tc's m_xt ------------------------------------------------------------------- Fri Dec 3 10:29:55 CET 2010 - ms@suse.de diff --git a/iproute2.spec b/iproute2.spec index d748b4b..6268aa6 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -20,6 +20,7 @@ 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 = %version-%release @@ -88,14 +89,16 @@ 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=/usr/share CCOPTS="-D_GNU_SOURCE $RPM_OPT_FLAGS -Wstrict-prototypes -fPIC" +make %{?_smp_mflags} LIBDIR=%_libdir CCOPTS="-D_GNU_SOURCE $RPM_OPT_FLAGS -Wstrict-prototypes -fPIC" 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=/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 @@ -120,6 +123,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/iproute2/rt_realms %config(noreplace) /etc/iproute2/rt_tables %config(noreplace) /etc/iproute2/ematch_map +%_libdir/m_xt.so %dir /usr/share/tc %attr(644,root,root)/usr/share/tc/*