- set proper OUTPUT_FORMAT and libdir in libiptc.so

diff --git a/iptables.spec b/iptables.spec
index 2ed1c7cdbe23478da440c299e9c0348dc13104da..5dc4b497f14126b3c702bea532fdc3c2cd45ae28 100644 (file)
--- a/iptables.spec
+++ b/iptables.spec
@@ -294,7 +294,14 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
 # upstream solution with empty library with two DT_NEEDED entries doesn't work
 # with PLD's default LDFLAGS (--as-needed --no-copy-dt-needed-entries);
 # use ld script instead (see no-libiptc.patch for source)
-cp -p libiptc/libiptc.ld $RPM_BUILD_ROOT%{_libdir}/libiptc.so
+%{__sed} \
+%ifarch %{x8664} alpha aarch64 hppa64 mips64 ppc64 s390x sparc64
+       -e 's,@BITS@,64,' \
+%else
+       -e 's,@BITS@,32,' \
+%endif
+       -e 's,@LIBDIR@,%{_libdir},' \
+       -e "s,@ARCH@,$(echo "%{_build_arch}" | tr _ -)," libiptc/libiptc.ld.in >$RPM_BUILD_ROOT%{_libdir}/libiptc.so
 
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/iptables
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/ip6tables

diff --git a/no-libiptc.patch b/no-libiptc.patch
index bc6c838f5682de656e2fd9610697631c2261a2ec..7a2bfcf793b179fc7593520076e061b37f857707 100644 (file)
--- a/no-libiptc.patch
+++ b/no-libiptc.patch
@@ -13,10 +13,10 @@
  libip4tc_la_LDFLAGS = -version-info 0:0:0
  libip6tc_la_SOURCES = libip6tc.c
 
---- iptables-1.4.16.2/libiptc/libiptc.ld.orig  1970-01-01 01:00:00.000000000 +0100
-+++ iptables-1.4.16.2/libiptc/libiptc.ld       2012-10-09 17:47:42.606342693 +0200
+--- iptables-1.4.16.2/libiptc/libiptc.ld.in.orig       1970-01-01 01:00:00.000000000 +0100
++++ iptables-1.4.16.2/libiptc/libiptc.ld.in    2012-10-09 17:47:42.606342693 +0200
 @@ -0,0 +1,4 @@
 +/* GNU ld script
 +   Gather both libipt4c and libipt6c, using them only as needed */
-+OUTPUT_FORMAT(elf32-i386)
-+GROUP ( AS_NEEDED ( /usr/lib/libip4tc.so /usr/lib/libip6tc.so ) )
++OUTPUT_FORMAT(elf@BITS@-@ARCH@)
++GROUP ( AS_NEEDED ( @LIBDIR@/libip4tc.so @LIBDIR@/libip6tc.so ) )