Revision: 25430 http://sourceforge.net/p/gar/code/25430 Author: janholzh Date: 2015-12-02 16:18:26 +0000 (Wed, 02 Dec 2015) Log Message: ----------- samba/branches/samba4: fix deps
Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2015-12-02 12:31:44 UTC (rev 25429) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2015-12-02 16:18:26 UTC (rev 25430) @@ -172,9 +172,9 @@ RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel5 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-client_5.11 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsamba4-client_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-client_sparc_5.10 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GAROSREL)) -RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GARCH)) +RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GARCH)_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += soname-unused #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += missing-dependency|CSWlibtevent0 #CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += surplus-dependency|CSWsamba4-libs @@ -315,9 +315,9 @@ RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibssp0 RUNTIME_DEP_PKGS_CSWsamba4-python_5.11 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWsamba4-python_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba4-python_sparc_5.10 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GAROSREL)) -RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GARCH)) +RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GARCH)_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += soname-unused CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/provision/backend.py CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/samba/external/testtools/tests/test_compat.py @@ -379,9 +379,9 @@ RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWnss-winbind1 += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWnss-winbind1_5.11 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWnss-winbind1_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWnss-winbind1_sparc_5.10 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWnss-winbind1 += $(RUNTIME_DEP_PKGS_CSWnss-winbind1_$(GAROSREL)) -RUNTIME_DEP_PKGS_CSWnss-winbind1 += $(RUNTIME_DEP_PKGS_CSWnss-winbind1_$(GARCH)) +RUNTIME_DEP_PKGS_CSWnss-winbind1 += $(RUNTIME_DEP_PKGS_CSWnss-winbind1_$(GARCH)_$(GAROSREL)) CHECKPKG_OVERRIDES_CSWnss-winbind1 += file-collision|/opt/csw/lib/nss_winbind.so.1|CSWnss-winbind1|CSWsamba-nss @@ -393,9 +393,9 @@ RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWsamba4-libs RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_5.11 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_sparc += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_sparc_5.10 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += $(RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_$(GAROSREL)) -RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += $(RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_$(GARCH)) +RUNTIME_DEP_PKGS_CSWwinbind-krb5locator += $(RUNTIME_DEP_PKGS_CSWwinbind-krb5locator_$(GARCH)_$(GAROSREL)) CHECKPKG_OVERRIDES_CSWwinbind-krb5locator += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so PACKAGES += CSWsamba4-nss-system-links This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.