iptables: Make package ready for x86_64.

diff --git a/iptables/iptables.nm b/iptables/iptables.nm
index ef8c3d04d281bcccc93c18cbe6429f00897e235d..b16942a61a9abb891d0c8553b97b9fad153f9a01 100644 (file)
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -5,7 +5,7 @@
 
 name       = iptables
 version    = 1.4.12.1
-release    = 1
+release    = 2
 
 groups     = Networking/Tools
 url        = http://www.netfilter.org/
@@ -32,10 +32,10 @@ build
        configure_options += \
                --bindir=/bin \
                --sbindir=/sbin \
-               --libdir=/lib \
-               --libexecdir=/lib \
+               --libdir=/%{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,13 +58,13 @@ 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
+               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