From 2a74527ad522ac7c1d467688eee81a7a3f895031 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 13 Jul 2012 00:01:54 +0000 Subject: Fri Jul 13 00:01:54 UTC 2012 --- testing/util-linux/PKGBUILD | 10 +++------- testing/util-linux/util-linux.install | 8 ++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 testing/util-linux/util-linux.install (limited to 'testing/util-linux') diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index 977fba7a2..2dc698974 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162814 2012-06-30 21:27:56Z tomegun $ +# $Id: PKGBUILD 163397 2012-07-11 22:26:49Z tomegun $ # Maintainer: Tom Gundersen # Contributor: judd pkgname=util-linux pkgver=2.21.2 -pkgrel=3 +pkgrel=4 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') @@ -18,13 +18,11 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgve pam-login pam-common) backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login) +install=util-linux.install build() { cd "${srcdir}/${pkgname}-${pkgver}" - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h - ./configure --prefix=/usr \ --libdir=/usr/lib \ --enable-fs-paths-extra=/usr/bin:/usr/sbin \ @@ -48,8 +46,6 @@ package() { cd "${pkgdir}" - install -dm755 var/lib/hwclock - # broken tool, going away in next major release, so just remove it now rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install new file mode 100644 index 000000000..fa27d4555 --- /dev/null +++ b/testing/util-linux/util-linux.install @@ -0,0 +1,8 @@ +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 + rmdir /var/lib/hwclock + fi +} -- cgit v1.2.3-54-g00ecf