SF.net SVN: gar:[22761] csw/mgar/pkg/krb5-lib/trunk/Makefile

[lblume at users.sourceforge.net]

Revision: 22761
          http://sourceforge.net/p/gar/code/22761
Author:   lblume
Date:     2013-12-28 22:56:01 +0000 (Sat, 28 Dec 2013)
Log Message:
-----------
krb5-lib/trunk: Merge another dep

Modified Paths:
--------------
    csw/mgar/pkg/krb5-lib/trunk/Makefile

Modified: csw/mgar/pkg/krb5-lib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/krb5-lib/trunk/Makefile	2013-12-28 17:56:45 UTC (rev 22760)
+++ csw/mgar/pkg/krb5-lib/trunk/Makefile	2013-12-28 22:56:01 UTC (rev 22761)
@@ -29,7 +29,6 @@
 SPKG_DESC_CSWlibkrb5-dev      = MIT Kerberos 5 developer libraries
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibkrb5support0
 RUNTIME_DEP_PKGS_CSWlibkrb5-dev += CSWlibverto0
@@ -42,7 +41,7 @@
 OBSOLETED_BY_CSWlibkrb5-dev = CSWkrb5libdev
 CATALOGNAME_CSWkrb5libdev = krb5_lib_dev_stub
 # On unstable10x, that lib does not appear to be linked
-CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWlibintl8
+#CHECKPKG_OVERRIDES_CSWlibkrb5-dev += surplus-dependency|CSWlibintl8
 
 PACKAGES += CSWlibcom-err3
 CATALOGNAME_CSWlibcom-err3 = libcom_err3
@@ -53,17 +52,17 @@
 RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibcom-err3 += CSWlibgcc-s1
 
-PACKAGES += CSWlibgssapi-krb5-2
-CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2
-PKGFILES_CSWlibgssapi-krb5-2 +=  $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*)
-SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2
-OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibgcc-s1
+#PACKAGES += CSWlibgssapi-krb5-2
+#CATALOGNAME_CSWlibgssapi-krb5-2 = libgssapi_krb5_2
+#PKGFILES_CSWlibgssapi-krb5-2 +=  $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*)
+#SPKG_DESC_CSWlibgssapi-krb5-2 += MIT Kerberos 5 core libraries, libgssapi_krb5.so.2
+#OBSOLETED_BY_CSWlibgssapi-krb5-2 = CSWkrb5lib
+#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5-3
+#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibcom-err3
+#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibk5crypto3
+#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibkrb5support0
+#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibintl8
+#RUNTIME_DEP_PKGS_CSWlibgssapi-krb5-2 += CSWlibgcc-s1
 
 PACKAGES += CSWlibk5crypto3
 CATALOGNAME_CSWlibk5crypto3 = libk5crypto3
@@ -99,6 +98,8 @@
 PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkrb5\.so\.3(\.\d+)*)
 PKGFILES_CSWlibkrb5-3 += $(sysconfdir)/krb5.conf
 PKGFILES_CSWlibkrb5-3 += $(mandir)/man5/krb5.conf.5
+# Include this lib in this package
+PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libgssapi_krb5\.so\.2(\.\d+)*)
 # Include the private bits in this package
 PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libgssrpc\.so\.\d+(\.\d+)*)
 PKGFILES_CSWlibkrb5-3 += $(call baseisadirs,$(libdir),libkadm5clnt_mit\.so\.\d+(\.\d+)*)
@@ -108,13 +109,13 @@
 SPKG_DESC_CSWlibkrb5-3 += MIT Kerberos 5 core and private libraries, libkrb5.so.3
 OBSOLETED_BY_CSWlibkrb5-3 += CSWkrb5lib
 OBSOLETED_BY_CSWlibkrb5-3 += CSWlibkrb5-priv
+OBSOLETED_BY_CSWlibkrb5-3 += CSWlibgssapi-krb5-2
 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibkrb5support0
 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibk5crypto3
 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWlibkrb5-3 += CSWlibgssapi-krb5-2
 CHECKPKG_OVERRIDES_CSWlibkrb5-3 += soname-not-part-of-filename
 CHECKPKG_OVERRIDES_CSWlibkrb5-3 += shared-lib-pkgname-mismatch
 

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