SF.net SVN: gar:[25248] csw/mgar/pkg/samba/branches/samba4/Makefile

[janholzh at users.sourceforge.net]

Revision: 25248
          http://sourceforge.net/p/gar/code/25248
Author:   janholzh
Date:     2015-09-23 08:41:55 +0000 (Wed, 23 Sep 2015)
Log Message:
-----------
samba/branches/samba4: samba4 last override, should be fine now

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-09-22 16:34:38 UTC (rev 25247)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile	2015-09-23 08:41:55 UTC (rev 25248)
@@ -810,15 +810,14 @@
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWnss-winbind1
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWwinbind-krb5locator
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += $(RUNTIME_DEP_PKGS_CSWsamba4-winbind_$(GAROSREL))
+CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWnss-winbind1
+CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWwinbind-krb5locator
 #CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += soname-unused
 CHECKPKG_OVERRIDES_CSWsamba4-winbind += file-collision
 #CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += missing-dependency|CSWlibtevent0
 #CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += missing-dependency|CSWlibwbclient0
 #CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += surplus-dependency|CSWsamba4-libs
 #CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWliblber2-4-2
-CHECKPKG_OVERRIDES_CSWsamba4-winbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/nss_winbind.so.1|soname=nss_winbind.so.1|pkgname=CSWsamba4-winbind|expected=CSWnss-winbind1
-CHECKPKG_OVERRIDES_CSWsamba4-winbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/winbind_krb5_locator.so|soname=winbind_krb5_locator.so|pkgname=CSWsamba4-winbind|expected=CSWwinbind-krb5locator
-CHECKPKG_OVERRIDES_CSWsamba4-winbind += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so
 CHECKPKG_OVERRIDES_CSWsamba4-winbind += $(CHECKPKG_OVERRIDES_CSWsamba4-winbind_$(GAROSREL))
 
 
@@ -856,7 +855,7 @@
 RUNTIME_DEP_PKGS_CSWsamba4-nss-system-links += CSWnss-winbind1
 CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += bad-location-of-file
 CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += file-collision
-CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_5.11 += surplus-dependency|CSWsamba4-winbind
+CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += surplus-dependency|CSWsamba4-winbind
 CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += $(CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links_$(GAROSREL))
 
 PACKAGES += CSWsamba4-pam-system-links

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