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

[Tom Gundersen]

    Date: Thursday, May 30, 2013 @ 14:59:08
  Author: tomegun
Revision: 186683

upgpkg: util-linux 2.23.1-2

usrmove

Modified:
  util-linux/trunk/PKGBUILD

----------+
 PKGBUILD |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-30 12:59:01 UTC (rev 186682)
+++ PKGBUILD	2013-05-30 12:59:08 UTC (rev 186683)
@@ -4,7 +4,7 @@
 
 pkgname=util-linux
 pkgver=2.23.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
@@ -39,7 +39,7 @@
   ./configure --prefix=/usr \
               --libdir=/usr/lib \
               --localstatedir=/run \
-              --enable-fs-paths-extra=/usr/bin:/usr/sbin \
+              --enable-fs-paths-extra=/usr/bin \
               --enable-raw \
               --enable-vipw \
               --enable-newgrp \
@@ -78,4 +78,10 @@
   # include tmpfiles fragment for uuidd
   # TODO(dreisner): offer this upstream?
   install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
+
+  # usrmove
+  cd "$pkgdir"
+  mv {,usr/}sbin/* usr/bin
+  mv bin/* usr/bin
+  rmdir bin sbin usr/sbin
 }