[arch-commits] Commit in 389-ds-base/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Sunday, August 11, 2019 @ 12:50:41
  Author: svenstaro
Revision: 359611

upgpkg: 389-ds-base 1.4.1.6-3

Modified:
  389-ds-base/trunk/PKGBUILD

----------+
 PKGBUILD |   43 +++++++++++--------------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-11 12:46:32 UTC (rev 359610)
+++ PKGBUILD	2019-08-11 12:50:41 UTC (rev 359611)
@@ -3,17 +3,21 @@
 # Contributor: Jameson Pugh <imntreal at gmail.com>
 # Contributor: Xiao-Long Chen <chenxiaolong at cxl.epac.to>
 
-pkgbase=389-ds-base
-pkgname=(389-ds-base python-lib389)
+pkgname=389-ds-base
 pkgver=1.4.1.6
-pkgrel=2
+pkgdesc="389 Directory Server (base)"
+pkgrel=3
 arch=(x86_64)
 url="http://port389.org/"
 license=(GPL)
+provides=(libsvrcore.so)
+optdepends=('python-lib389: Python management scripts')
+backup=(etc/dirsrv/config/certmap.conf
+        etc/dirsrv/config/ldap-agent.conf
+        etc/dirsrv/config/slapd-collations.conf
+        etc/dirsrv/config/template-initconfig)
 depends=(libevent nspr nss net-snmp pam openldap)
-checkdepends=(python-pytest)
-makedepends=(cargo rsync doxygen cmocka python python-setuptools
-             python-argparse-manpage python-argcomplete python-ldap)
+makedepends=(cargo rsync doxygen cmocka)
 source=("https://releases.pagure.org/389-ds-base/${pkgname}-${pkgver}.tar.bz2")
 sha512sums=('0a943453cbcd8b43b4fdc58563c8802d9270d9a3cf4dcd76e3f77168d45e84b8e07d8df8ddadb09ba9294e7ba7e9304ce329bc37edeb16a9161797c902fadc1c')
 
@@ -43,10 +47,6 @@
     --with-openldap \
     --enable-rust
   make
-
-  # Build python-lib389
-  cd src/lib389
-  python setup.py build
 }
 
 check() {
@@ -54,15 +54,7 @@
   make check
 }
 
-package_389-ds-base() {
-  pkgdesc="389 Directory Server (base)"
-  provides=(libsvrcore.so)
-  optdepends=('python-lib389: Python management scripts')
-  backup=(etc/dirsrv/config/certmap.conf
-          etc/dirsrv/config/ldap-agent.conf
-          etc/dirsrv/config/slapd-collations.conf
-          etc/dirsrv/config/template-initconfig)
-
+package() {
   cd "${pkgbase}-${pkgver}"
   make -j1 DESTDIR="${pkgdir}/" install
 
@@ -69,16 +61,3 @@
   install -dm755 "${pkgdir}"/var/log/${pkgbase}/ "${pkgdir}"/var/lib/${pkgbase}/
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
-
-package_python-lib389() {
-  pkgdesc="389 Directory Server (Python management scripts)"
-  depends=(python python-argcomplete python-ldap)
-
-  cd "${pkgbase}-${pkgver}"/src/lib389
-  python setup.py install --skip-build -O1 --root=${pkgdir}
-  mv ${pkgdir}/usr/sbin ${pkgdir}/usr/bin
-
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-# vim: set ts=2 sw=2 ft=sh et: