[csw-devel] SF.net SVN: gar:[13847] csw/mgar/pkg/libiconv/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 13847
          http://gar.svn.sourceforge.net/gar/?rev=13847&view=rev
Author:   dmichelsen
Date:     2011-03-17 08:42:47 +0000 (Thu, 17 Mar 2011)

Log Message:
-----------
libiconv: Add libcharset1 as obsoletion for CSWiconv

Modified Paths:
--------------
    csw/mgar/pkg/libiconv/trunk/Makefile

Modified: csw/mgar/pkg/libiconv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libiconv/trunk/Makefile	2011-03-17 03:26:54 UTC (rev 13846)
+++ csw/mgar/pkg/libiconv/trunk/Makefile	2011-03-17 08:42:47 UTC (rev 13847)
@@ -26,6 +26,7 @@
 CATALOGNAME_CSWlibiconv2 = libiconv2
 SPKG_DESC_CSWlibiconv2 = GNU iconv library, libiconv.so.2
 PKGFILES_CSWlibiconv2 += $(call pkgfiles_lib,libiconv.so.2)
+OBSOLETES_CSWlibiconv2 += CSWiconv
 
 PACKAGES += CSWlibcharset1
 CATALOGNAME_CSWlibcharset1 = libcharset1
@@ -34,6 +35,7 @@
 # Now *this* time it is ok, iconv is the only package that is allowed to ship this!
 CHECKPKG_OVERRIDES_CSWlibcharset1 += disallowed-path|opt/csw/lib/charset.alias
 PKGFILES_CSWlibcharset1 += $(call baseisadirs,$(libdir),charset\.alias)
+OBSOLETES_CSWlibcharset1 += CSWiconv
 
 PACKAGES += CSWlibiconv-dev
 CATALOGNAME_CSWlibiconv-dev = libiconv_dev
@@ -58,7 +60,7 @@
 CHECKPKG_OVERRIDES_CSWlibiconv-utils += shared-lib-pkgname-mismatch|sonames=libiconv.so.0|pkgname=CSWlibiconv-utils|expected=CSWlibiconv0
 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWlibiconv-utils += CSWlibintl8
-OBSOLETES_CSWlibiconv-utils = CSWiconv
+OBSOLETES_CSWlibiconv-utils += CSWiconv
 
 NOISAEXEC = 1
 BUILD64 = 1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.