Merge remote-tracking branch 'ms/kernel-3.2'

[people/ms/ipfire-3.x.git] / iptables / iptables.nm

diff --git a/iptables/iptables.nm b/iptables/iptables.nm
index ef8c3d04d281bcccc93c18cbe6429f00897e235d..b809b20e0c359c1e3b987b219d465ee6815aec49 100644 (file)
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = iptables
-version    = 1.4.12.1
+version    = 1.4.13
 release    = 1
 
 groups     = Networking/Tools
@@ -30,12 +30,9 @@ build
        CFLAGS += -fno-strict-aliasing
 
        configure_options += \
-               --bindir=/bin \
-               --sbindir=/sbin \
-               --libdir=/lib \
-               --libexecdir=/lib \
+               --libexecdir=/%{lib} \
                --sysconfdir=/etc \
-               --with-pkgconfigdir=/usr/lib/pkgconfig \
+               --with-pkgconfigdir=%{libdir}/pkgconfig \
                --mandir=/usr/share/man \
                --with-kernel=/usr \
                --with-kbuild=/usr \
@@ -58,20 +55,8 @@ build
                install -v -m 644 include/libiptc/*.h \
                        %{BUILDROOT}/usr/include/libiptc
 
-               mkdir -pv %{BUILDROOT}/usr/lib
-               rm -vf %{BUILDROOT}/lib/libip{tc,4tc,6tc,q}.so %{BUILDROOT}/lib/libxtables.so
-               ln -svf ../../lib/libiptc.so.0 %{BUILDROOT}/usr/lib/libiptc.so
-               ln -svf ../../lib/libip4tc.so.0 %{BUILDROOT}/usr/lib/libip4tc.so
-               ln -svf ../../lib/libip6tc.so.0 %{BUILDROOT}/usr/lib/libip6tc.so
-               ln -svf ../../lib/libipq.so.0 %{BUILDROOT}/usr/lib/libipq.so
-               ln -svf ../../lib/libxtables.so.7 %{BUILDROOT}/usr/lib/libxtables.so
-
-               # Replace absolute symlink
-               ln -svf ../sbin/xtables-multi %{BUILDROOT}/bin/iptables-xml
-
-               # Move binary which links to /usr/lib to /usr.
-               mkdir -pv %{BUILDROOT}/usr/sbin
-               mv -v %{BUILDROOT}/{,usr/}sbin/nfnl_osf
+               # Remove relative symlinks.
+               ln -svf ../sbin/xtables-multi %{BUILDROOT}/usr/bin/iptables-xml
        end
 end