[arch-commits] Commit in util-linux/trunk (PKGBUILD)

[Dave Reisner]

    Date: Saturday, November 23, 2019 @ 00:37:24
  Author: dreisner
Revision: 369618

upgpkg: util-linux 2.34-8

- add --enable-usrdir-path
- add --sbindir=/usr/bin

Net effect: fstrim.service now references /usr/bin/fstrim.service instead of
/sbin/fstrim.service. setpriv no longer has root directories in its PATH.

This doesn't really accomplish what FS#64492 wants, but I'm not interested in
patching util-linux source just for a cosmetic issue.

Modified:
  util-linux/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-22 23:12:43 UTC (rev 369617)
+++ PKGBUILD	2019-11-23 00:37:24 UTC (rev 369618)
@@ -6,7 +6,7 @@
 pkgname=(util-linux libutil-linux)
 _pkgmajor=2.34
 pkgver=${_pkgmajor}
-pkgrel=7
+pkgrel=8
 pkgdesc="Miscellaneous system utilities for Linux"
 url='https://github.com/karelzak/util-linux'
 arch=('x86_64')
@@ -52,7 +52,9 @@
     --prefix=/usr \
     --libdir=/usr/lib \
     --bindir=/usr/bin \
+    --sbindir=/usr/bin \
     --localstatedir=/var \
+    --enable-usrdir-path \
     --enable-fs-paths-default=/usr/bin:/usr/local/bin \
     --enable-raw \
     --enable-vipw \
@@ -103,8 +105,8 @@
   # adjust for usrmove
   # TODO(dreisner): fix configure.ac upstream so that this isn't needed
   cd "$pkgdir"
-  mv {,usr/}sbin/* usr/bin
-  rmdir sbin usr/sbin
+  mv usr/sbin/* usr/bin
+  rmdir usr/sbin
 
   ### runtime libs are shipped as part of libutil-linux
   rm "$pkgdir"/usr/lib/lib*.{a,so}*