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

[Christian Hesse]

    Date: Thursday, September 10, 2020 @ 10:12:35
  Author: eworm
Revision: 395678

upgpkg: util-linux 2.36-4: rename libutil-linux -> util-linux-libs

Modified:
  util-linux/trunk/PKGBUILD

----------+
 PKGBUILD |   38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-10 09:55:52 UTC (rev 395677)
+++ PKGBUILD	2020-09-10 10:12:35 UTC (rev 395678)
@@ -3,11 +3,11 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgbase=util-linux
-pkgname=(util-linux libutil-linux)
+pkgname=(util-linux util-linux-libs)
 _pkgmajor=2.36
 pkgver=${_pkgmajor}
-pkgrel=3
-pkgdesc="Miscellaneous system utilities for Linux"
+pkgrel=4
+pkgdesc='Miscellaneous system utilities for Linux'
 url='https://github.com/karelzak/util-linux'
 arch=('x86_64')
 makedepends=('systemd' 'python' 'libcap-ng' 'libxcrypt')
@@ -65,7 +65,7 @@
   provides=('rfkill')
   replaces=('rfkill')
   depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so'
-           'libudev.so' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'libutil-linux'
+           'libudev.so' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
            'libmagic.so' 'libncursesw.so' 'libreadline.so')
   optdepends=('python: python bindings to libmount'
               'words: default dictionary for look')
@@ -85,13 +85,13 @@
   chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
 
   # install PAM files for login-utils
-  install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
-  install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
-  install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
-  install -m644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser"
-  install -m644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser-l"
-  install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
-  install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l"
+  install -Dm0644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
+  install -m0644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
+  install -m0644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
+  install -m0644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser"
+  install -m0644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser-l"
+  install -m0644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su"
+  install -m0644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l"
 
   # TODO(dreisner): offer this upstream?
   sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket"
@@ -102,25 +102,27 @@
   mv usr/sbin/* usr/bin
   rmdir usr/sbin
 
-  ### runtime libs are shipped as part of libutil-linux
+  ### runtime libs are shipped as part of util-linux-libs
   rm "$pkgdir"/usr/lib/lib*.{a,so}*
 
   ### install systemd-sysusers
-  install -Dm644 "$srcdir/util-linux.sysusers" \
+  install -Dm0644 "$srcdir/util-linux.sysusers" \
     "$pkgdir/usr/lib/sysusers.d/util-linux.conf"
 
-  install -Dm644 "$srcdir/60-rfkill.rules" \
+  install -Dm0644 "$srcdir/60-rfkill.rules" \
     "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules"
 
-  install -Dm644 "$srcdir/rfkill-unblock_.service" \
+  install -Dm0644 "$srcdir/rfkill-unblock_.service" \
     "$pkgdir/usr/lib/systemd/system/rfkill-unblock at .service"
-  install -Dm644 "$srcdir/rfkill-block_.service" \
+  install -Dm0644 "$srcdir/rfkill-block_.service" \
     "$pkgdir/usr/lib/systemd/system/rfkill-block at .service"
 }
 
-package_libutil-linux() {
+package_util-linux-libs() {
   pkgdesc="util-linux runtime libraries"
-  provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+  provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
+  conflicts=('libutil-linux')
+  replaces=('libutil-linux')
 
   make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
 }