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 b16942a61a9abb891d0c8553b97b9fad153f9a01..b809b20e0c359c1e3b987b219d465ee6815aec49 100644 (file)
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = iptables
-version    = 1.4.12.1
-release    = 2
+version    = 1.4.13
+release    = 1
 
 groups     = Networking/Tools
 url        = http://www.netfilter.org/
@@ -30,9 +30,6 @@ build
        CFLAGS += -fno-strict-aliasing
 
        configure_options += \
-               --bindir=/bin \
-               --sbindir=/sbin \
-               --libdir=/%{lib} \
                --libexecdir=/%{lib} \
                --sysconfdir=/etc \
                --with-pkgconfigdir=%{libdir}/pkgconfig \
@@ -58,20 +55,8 @@ build
                install -v -m 644 include/libiptc/*.h \
                        %{BUILDROOT}/usr/include/libiptc
 
-               mkdir -pv %{BUILDROOT}%{libdir}
-               rm -vf %{BUILDROOT}/%{lib}/libip{tc,4tc,6tc,q}.so %{BUILDROOT}/%{lib}/libxtables.so
-               ln -svf ../../%{lib}/libiptc.so.0 %{BUILDROOT}%{libdir}/libiptc.so
-               ln -svf ../../%{lib}/libip4tc.so.0 %{BUILDROOT}%{libdir}/libip4tc.so
-               ln -svf ../../%{lib}/libip6tc.so.0 %{BUILDROOT}%{libdir}/libip6tc.so
-               ln -svf ../../%{lib}/libipq.so.0 %{BUILDROOT}%{libdir}/libipq.so
-               ln -svf ../../%{lib}/libxtables.so.7 %{BUILDROOT}%{libdir}/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