rpms/iptables/devel iptables.spec,1.81,1.82

[Thomas Woerner]

Author: twoerner

Update of /cvs/pkgs/rpms/iptables/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19024

Modified Files:
	iptables.spec 
Log Message:
- moved libip*tc and libxtables libs to /lib[64], added symlinks for .so libs
  to /usr/lib[64] for compatibility (rhbz#558796)




Index: iptables.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iptables/devel/iptables.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- iptables.spec	13 Jan 2010 15:34:55 -0000	1.81
+++ iptables.spec	27 Jan 2010 15:03:10 -0000	1.82
@@ -1,7 +1,7 @@
 Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Version: 1.4.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -55,7 +55,7 @@ stable and may change with every new ver
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-./configure --enable-devel --enable-libipq --bindir=/bin --sbindir=/sbin --sysconfdir=/etc --libdir=/%{_libdir} --libexecdir=/%{_lib} --mandir=%{_mandir} --includedir=%{_includedir} --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr
+./configure --enable-devel --enable-libipq --bindir=/bin --sbindir=/sbin --sysconfdir=/etc --libdir=/%{_lib} --libexecdir=/%{_lib} --mandir=%{_mandir} --includedir=%{_includedir} --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr
 
 # do not use rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -68,7 +68,7 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot} 
 # remove la file(s)
-rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_lib}/*.la
 
 # install ip*tables.h header files
 install -m 644 include/ip*tables.h %{buildroot}%{_includedir}/
@@ -79,6 +79,18 @@ install -m 644 include/iptables/internal
 install -d -m 755 %{buildroot}%{_includedir}/libipulog/
 install -m 644 include/libipulog/*.h %{buildroot}%{_includedir}/libipulog/
 
+# create symlinks for devel so libs
+install -d -m 755 %{buildroot}%{_libdir}
+for i in %{buildroot}/%{_lib}/libip*tc.so %{buildroot}/%{_lib}/libxtables.so; do
+    ln -s ../../%{_lib}/${i##*/} %{buildroot}%{_libdir}/${i##*/}
+done
+
+# move static libipq to %{_libdir}
+mv %{buildroot}/%{_lib}/libipq.a %{buildroot}/%{_libdir}/
+
+# move pkgconfig to %{_libdir}
+mv %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir}/
+
 # install init scripts and configuration files
 install -d -m 755 %{buildroot}/etc/rc.d/init.d
 install -c -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/iptables
@@ -121,10 +133,8 @@ fi
 %dir /%{_lib}/xtables
 /%{_lib}/xtables/libipt*
 /%{_lib}/xtables/libxt*
-%{_libdir}/libiptc.so.*
-%{_libdir}/libip4tc.so.*
-%{_libdir}/libip6tc.so.*
-%{_libdir}/libxtables.so.*
+/%{_lib}/libip*tc.so.*
+/%{_lib}/libxtables.so.*
 
 %files ipv6
 %defattr(-,root,root)
@@ -146,12 +156,18 @@ fi
 %{_includedir}/libipulog/*.h
 %{_libdir}/libipq.a
 %{_mandir}/man3/*
+/%{_lib}/libip*tc.so
+/%{_lib}/libxtables.so
 %{_libdir}/libip*tc.so
 %{_libdir}/libxtables.so
 %{_libdir}/pkgconfig/libiptc.pc
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Wed Jan 27 2010 Thomas Woerner <twoerner at redhat.com> 1.4.6-2
+- moved libip*tc and libxtables libs to /lib[64], added symlinks for .so libs
+  to /usr/lib[64] for compatibility (rhbz#558796)
+
 * Wed Jan 13 2010 Thomas Woerner <twoerner at redhat.com> 1.4.6-1
 - new version 1.4.6 with support for all new features of 2.6.32
   - several man page fixes