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

[Dave Reisner]

    Date: Saturday, February 21, 2015 @ 15:31:57
  Author: dreisner
Revision: 231713

upgpkg: util-linux 2.26-2

- add zramctl conflicts/provides/replaces
- cleanup install scriptlet

Modified:
  util-linux/trunk/PKGBUILD
  util-linux/trunk/util-linux.install

--------------------+
 PKGBUILD           |    7 ++++---
 util-linux.install |   11 +----------
 2 files changed, 5 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-21 13:39:05 UTC (rev 231712)
+++ PKGBUILD	2015-02-21 14:31:57 UTC (rev 231713)
@@ -6,7 +6,7 @@
 pkgbase=util-linux
 pkgname=(util-linux libutil-linux)
 pkgver=2.26
-pkgrel=1
+pkgrel=2
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
@@ -45,8 +45,9 @@
 }
 
 package_util-linux() {
-  conflicts=('util-linux-ng' 'eject')
-  provides=("util-linux-ng=$pkgver" 'eject')
+  conflicts=('util-linux-ng' 'eject' 'zramctl')
+  provides=("util-linux-ng=$pkgver" 'eject' 'zramctl')
+  replaces=('zramctl')
   depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libutil-linux')
   optdepends=('python: python bindings to libmount')
   install=util-linux.install

Modified: util-linux.install
===================================================================
--- util-linux.install	2015-02-21 13:39:05 UTC (rev 231712)
+++ util-linux.install	2015-02-21 14:31:57 UTC (rev 231713)
@@ -1,7 +1,7 @@
 post_install() {
   # we don't want use systemd-tmpfiles here because
   # the package dependency would create a circular dep.
-  if [ ! -d run/uuidd ]; then
+  if [[ ! -d run/uuidd ]]; then
     # refer to uid/gid by number to avoid dependency on filesystem
     install -o 68 -g 68 -dm755 run/uuidd
   fi
@@ -8,14 +8,5 @@
 }
 
 post_upgrade() {
-  if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then
-    if [ -f /var/lib/hwclock/adjtime ]; then
-      mv /var/lib/hwclock/adjtime /etc/adjtime
-    fi
-    if [ -d /var/lib/hwclock ]; then
-      rmdir /var/lib/hwclock
-    fi
-  fi
-
   post_install
 }