From 77a04e7153da6312372e55c3e8dc4179fb4ca832 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 22 Apr 2010 15:18:59 +0200
Subject: [PATCH] tcp_wrappers-libs: move so symlink into main pkg.

--HG--
extra : convert_revision : 3e82601b7582a718fc233240ab510b6f7daea13b
---
 srcpkgs/tcp_wrappers/tcp_wrappers-devel.template | 4 +++-
 srcpkgs/tcp_wrappers/tcp_wrappers-libs.template  | 3 ++-
 srcpkgs/tcp_wrappers/template                    | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template b/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template
index 319c8a1479..6b451ee2ae 100644
--- a/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template
+++ b/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template
@@ -5,6 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run glibc-devel
 Add_dependency run tcp_wrappers-libs
 
 do_install()
@@ -15,5 +18,4 @@ do_install()
 	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template b/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template
index d6eb3473d8..b89eb664b9 100644
--- a/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template
+++ b/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template
@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains the ${pkgname} shared libraries."
 
+revision=1
 conf_files="/etc/hosts.allow /etc/hosts.deny"
 
 Add_dependency run glibc
@@ -13,7 +14,7 @@ do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
 	mkdir -p ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so.* ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/etc ${DESTDIR}
 	mv ${SRCPKGDESTDIR}/usr/share/man/man5 ${DESTDIR}/usr/share/man
 }
diff --git a/srcpkgs/tcp_wrappers/template b/srcpkgs/tcp_wrappers/template
index a09bf0ff8f..c5593e6c21 100644
--- a/srcpkgs/tcp_wrappers/template
+++ b/srcpkgs/tcp_wrappers/template
@@ -27,4 +27,5 @@ pre_install()
 	done
 	install -D -m644 ${FILESDIR}/hosts.allow ${DESTDIR}/etc/hosts.allow
 	install -m644 ${FILESDIR}/hosts.deny ${DESTDIR}/etc/hosts.deny
+	sed -i -e "s|-o root -g root||g" ${wrksrc}/Makefile
 }