diff options
| -rw-r--r-- | main/ldb/APKBUILD | 2 | ||||
| -rw-r--r-- | main/samba/APKBUILD | 4 | ||||
| -rw-r--r-- | main/tdb/APKBUILD | 17 |
3 files changed, 12 insertions, 11 deletions
diff --git a/main/ldb/APKBUILD b/main/ldb/APKBUILD index ab030d604e7..126e41d7dcd 100644 --- a/main/ldb/APKBUILD +++ b/main/ldb/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="A schema-less, ldap like, API and database" url="http://ldb.samba.org/" arch="all" license="LGPL-3.0-or-later" -makedepends="libtirpc-dev tevent-dev py2-tevent tdb-dev py-tdb talloc-dev +makedepends="libtirpc-dev tevent-dev py2-tevent tdb-dev py2-tdb talloc-dev python2-dev python3-dev popt-dev cmocka-dev" subpackages="$pkgname-dev py2-$pkgname:_py2 py3-$pkgname:_py3 $pkgname-tools" source="https://www.samba.org/ftp/pub/ldb/$pkgname-$pkgver.tar.gz diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD index 0427b2feb6a..0fd1b0e1a01 100644 --- a/main/samba/APKBUILD +++ b/main/samba/APKBUILD @@ -40,7 +40,7 @@ depends="$pkgname-server=$pkgver-r$pkgrel # note that heimdal is required (over mit krb5) for AD DC functionality makedepends="popt-dev ncurses-dev openldap-dev e2fsprogs-dev - talloc-dev tdb-dev py-tdb ldb-dev>=1.2.2 cups-dev python2-dev libcap-dev + talloc-dev tdb-dev py2-tdb ldb-dev>=1.2.2 cups-dev python2-dev libcap-dev tevent-dev py2-tevent iniparser-dev perl subunit-dev docbook-xsl libarchive-dev acl-dev fuse-dev libtirpc-dev rpcgen" source="https://us1.samba.org/samba/ftp/stable/$pkgname-$pkgver.tar.gz @@ -419,7 +419,7 @@ pidl() { _py() { pkgdesc="Samba python libraries" - depends="py-tdb" + depends="py2-tdb" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ } diff --git a/main/tdb/APKBUILD b/main/tdb/APKBUILD index 5e82af3460b..96c4332684e 100644 --- a/main/tdb/APKBUILD +++ b/main/tdb/APKBUILD @@ -1,17 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=tdb pkgver=1.3.15 -pkgrel=0 +pkgrel=1 pkgdesc="The tdb library" url="http://tdb.samba.org/" arch="all" license="LGPL-3.0-or-later" depends_dev="python2" makedepends="$depends_dev python2-dev docbook-xsl" -subpackages="$pkgname-dev py-$pkgname:_py $pkgname-libs $pkgname-doc" -source="http://samba.org/ftp/tdb/tdb-$pkgver.tar.gz - " - +subpackages="$pkgname-dev py2-$pkgname:_py2 $pkgname-libs $pkgname-doc" +source="http://samba.org/ftp/tdb/tdb-$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" build() { @@ -40,10 +38,13 @@ package() { make DESTDIR="$pkgdir" install } -_py() { - pkgdesc="Python binding for the tdb library" +_py2() { + pkgdesc="Python 2 binding for the tdb library" + provides="py-tdb=$pkgver-r$pkgrel" # for backward compatibility + replaces="py-tdb" # for backward compatibility + mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ + mv "$pkgdir"/usr/lib/python2* "$subpkgdir"/usr/lib/ } libs() { |