From 2431fc3b7d48a53bc50bb1dfd90b8c6ff4de59c5 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Fri, 18 Apr 2008 15:59:55 +0000
Subject: [PATCH] Redo package layout again. If upstream is called libfoo then
 don't create a foo-lib package. Perhaps foo-progs if you want to seperate any
 binaries.

---
 libiconv/build.sh    |  4 +---
 libiconv/meta/pkgdef | 12 +-----------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/libiconv/build.sh b/libiconv/build.sh
index 3c0dab0..01bfa65 100755
--- a/libiconv/build.sh
+++ b/libiconv/build.sh
@@ -38,10 +38,8 @@ reg install
 install()
 {
     generic_install DESTDIR
-    doc NOTES ChangeLog DESIGN NEWS COPYING AUTHORS README
-    docs_for libiconv2 COPYING.LIB ChangeLog AUTHORS NEWS
+    doc NOTES ChangeLog DESIGN NEWS COPYING AUTHORS README COPYING.LIB
     ${__rm} -f ${stagedir}${prefix}/${_libdir}/charset.alias
-
 }
 
 reg pack
diff --git a/libiconv/meta/pkgdef b/libiconv/meta/pkgdef
index 7084dcf..3ad74ad 100644
--- a/libiconv/meta/pkgdef
+++ b/libiconv/meta/pkgdef
@@ -8,6 +8,7 @@ pkgver="$pkgver"
 files(-,root,bin)
 default_docs
 $_bindir
+$_libdir/libiconv.so.2*
 $_libdir/libcharset.so.*
 $_libdir/preloadable_libiconv.so
 $_mandir/man1
@@ -27,14 +28,3 @@ $_libdir/libcharset.so
 $_libdir/*.a
 $_mandir/man3
 $_sharedir/doc/libiconv/*.3.html
-
-[libiconv2]
-pkgname="${pkgprefix}licnv2"
-name="libiconv.so.2 - GNU libiconv shared support library"
-pkgcat="system"
-pkgvendor="http://directory.fsf.org/libiconv.html"
-pkgdesc="Runtime support library for applications using GNU libiconv"
-pkgver="$pkgver"
-files(-,root,bin)
-default_docs
-$_libdir/libiconv.so.2*