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

[Sven-Hendrik Haase]

    Date: Saturday, January 25, 2020 @ 04:32:02
  Author: svenstaro
Revision: 373897

upgpkg: 389-ds-base 1.4.2.7-1

Modified:
  389-ds-base/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-24 23:08:57 UTC (rev 373896)
+++ PKGBUILD	2020-01-25 04:32:02 UTC (rev 373897)
@@ -4,7 +4,7 @@
 # Contributor: Xiao-Long Chen <chenxiaolong at cxl.epac.to>
 
 pkgname=389-ds-base
-pkgver=1.4.2.5
+pkgver=1.4.2.7
 pkgdesc="389 Directory Server (base)"
 pkgrel=1
 arch=(x86_64)
@@ -20,12 +20,10 @@
 makedepends=(cargo rsync doxygen cmocka python-setuptools python-argparse-manpage)
 source=("https://releases.pagure.org/389-ds-base/${pkgname}-${pkgver}.tar.bz2"
         389-ds-base.sysusers
-        389-ds-base.tmpfiles
-        bcf5e9f.patch)
-sha512sums=('46cdf18809466faa2104a3fd5aa16d2b0525bc73c7a517e167c85cb0d6d6078e78b20a865c2eafe4671e11a2f0c879b1f1292c10d8a3aeb20da769511d60542a'
+        389-ds-base.tmpfiles)
+sha512sums=('7bbb5b8f3ca71c3bd3be8afb15a5923fb407fed920d3b6e8674232d825c500a7c9bba5d03dc281a9c54352688e7b2b82a0ff481fc84eea06f66ea760b96b2b2a'
             '8689b60f13517e6541e1faa62e61781654a8e4678990d14a3fe0cfe4673697cdde1c46763fdc7ef6203e4026286fa004c73b2857fd7fecff69483e6d1e8e6d68'
-            '5dff695ae866a591a711f836f2f72f2005b4afdb20760cda8711791910299e2c6ec71dff5eca9a2d9832cad8f9e9904dbbcf2d314cd9b20432bc8fd05c097868'
-            'e80bbde036b0e1d6db4ccc800c429a5e4df06f26ecf709159510f0058d2031db1c8794418b74acf9f41cda3627891f38d5867cbff8e0a9569d41550af5feef88')
+            '5dff695ae866a591a711f836f2f72f2005b4afdb20760cda8711791910299e2c6ec71dff5eca9a2d9832cad8f9e9904dbbcf2d314cd9b20432bc8fd05c097868')
 
 prepare() {
   cd "${pkgbase}-${pkgver}"
@@ -34,7 +32,6 @@
   cargo fetch --manifest-path=./src/libsds/Cargo.toml
   cargo vendor --manifest-path=./src/librslapd/Cargo.toml
   cargo fetch --manifest-path=./src/librslapd/Cargo.toml
-  patch -Np1 -i "$srcdir"/bcf5e9f.patch
 
   autoreconf -fiv
 }
@@ -79,9 +76,9 @@
   # 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
+  python setup.py install --skip-build -O1 --root="${pkgdir}"
+  mv "${pkgdir}"/usr/sbin/* "${pkgdir}"/usr/bin/
+  rmdir "${pkgdir}"/usr/sbin
 
   install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
   install -Dm644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"