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

[Sven-Hendrik Haase]

    Date: Monday, August 12, 2019 @ 21:06:07
  Author: svenstaro
Revision: 359777

upgpkg: 389-ds-base 1.4.1.6-4

Go back to shipping lib389 as part of this package

The reasoning is that upstream has actually merged lib389 back into 389-ds-base and wants people to stop using the standalone thing.
In fact, the standalone is now read-only. The Python in here also seems way more recent.

Modified:
  389-ds-base/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-12 20:32:02 UTC (rev 359776)
+++ PKGBUILD	2019-08-12 21:06:07 UTC (rev 359777)
@@ -6,18 +6,17 @@
 pkgname=389-ds-base
 pkgver=1.4.1.6
 pkgdesc="389 Directory Server (base)"
-pkgrel=3
+pkgrel=4
 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)
-makedepends=(cargo rsync doxygen cmocka)
+depends=(libevent nspr nss net-snmp pam openldap python-argcomplete python-dateutil python-ldap)
+makedepends=(cargo rsync doxygen cmocka python-setuptools python-argparse-manpage)
 source=("https://releases.pagure.org/389-ds-base/${pkgname}-${pkgver}.tar.bz2")
 sha512sums=('0a943453cbcd8b43b4fdc58563c8802d9270d9a3cf4dcd76e3f77168d45e84b8e07d8df8ddadb09ba9294e7ba7e9304ce329bc37edeb16a9161797c902fadc1c')
 
@@ -47,6 +46,10 @@
     --with-openldap \
     --enable-rust
   make
+
+  # Build lib389
+  cd src/lib389
+  python setup.py build
 }
 
 check() {
@@ -60,4 +63,11 @@
 
   install -dm755 "${pkgdir}"/var/log/${pkgbase}/ "${pkgdir}"/var/lib/${pkgbase}/
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  # Upstream expects lib389 and 389-ds-base to be shipped in the same package more or less
+  # so that's why it's not a split package.
+  cd src/lib389
+  python setup.py install --skip-build -O1 --root=${pkgdir}
+  mv ${pkgdir}/usr/sbin/* ${pkgdir}/usr/bin/
+  rmdir ${pkgdir}/usr/sbin
 }