adjust @conflict lines to not include the version number; they were out of
date compared to 7.1-stable causing pkg_add -u to not allow merging python+ldb+tevent. ok jca@
This commit is contained in:
parent
a6739c8db5
commit
9e273b3195
@ -8,6 +8,8 @@ COMMENT-docs = additional documentation and examples for Samba
|
||||
PKGNAME-main = ${PKGNAME}
|
||||
PKGNAME-docs = samba-docs-${VERSION}
|
||||
|
||||
REVISION-main = 0
|
||||
|
||||
PKG_ARCH-docs = *
|
||||
|
||||
SHARED_LIBS = dcerpc 1.1 \
|
||||
|
@ -1,5 +1,5 @@
|
||||
@conflict ldb-<=2.4.3v0
|
||||
@conflict tevent-<=0.11.0p6v0
|
||||
@conflict ldb-*
|
||||
@conflict tevent-*
|
||||
@conflict samba-util-<=4.15.8v0
|
||||
@pkgpath net/samba,ldap,-main
|
||||
@pkgpath net/samba,ads,-main
|
||||
|
Loading…
x
Reference in New Issue
Block a user