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

[Jan de Groot]

    Date: Saturday, August 1, 2009 @ 07:17:19
  Author: jgc
Revision: 48289

upgpkg: util-linux-ng 2.16-1
    Update to 2.16:
Remove dependency on e2fsprogs, the required libs are in util-linux-ng itself now
Conflict with e2fsprogs still providing these libs
Compress info pages

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

-----------------------+
 PKGBUILD              |   37 +++++++++++++++++++------------------
 util-linux-ng.install |    2 +-
 2 files changed, 20 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-01 11:15:06 UTC (rev 48288)
+++ PKGBUILD	2009-08-01 11:17:19 UTC (rev 48289)
@@ -1,39 +1,40 @@
 # $Id$
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=util-linux-ng
-pkgver=2.14.2
-_loop_date=20090214
+pkgver=2.16
+_loop_date=20090725
 pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://userweb.kernel.org/~kzak/util-linux-ng/"
 arch=('i686' 'x86_64')
 groups=('base')
-depends=('bash' 'ncurses>=5.7' 'zlib' 'e2fsprogs')
+depends=('bash' 'ncurses>=5.7' 'zlib')
 replaces=('linux32' 'util-linux')
-conflicts=('linux32' 'util-linux')
+conflicts=('linux32' 'util-linux' 'e2fsprogs<1.41.8-2')
 provides=('linux32' 'util-linux')
 license=('GPL2')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.14/${pkgname}-${pkgver}.tar.bz2
+options=('!libtool')
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.16/${pkgname}-${pkgver}.tar.bz2
 	http://loop-aes.sourceforge.net/updates/${pkgname}-${pkgver}-${_loop_date}.diff.bz2)
 install=util-linux-ng.install
-md5sums=('b9d0053a22cfcbf0b9c0aa6d6eccfbc8'
-         '72c5b3e961efc1bda2750dbad019e414')
+md5sums=('9623380641b0c2e0449f5b1ecc567663'
+         '1752b93df05410a8df8e84d07d41f048')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   # cryptoloop support
-  patch -Np1 -i ${srcdir}/${pkgname}-${pkgver}-${_loop_date}.diff || return 1
+  patch -Np1 -i "${srcdir}/${pkgname}-${pkgver}-${_loop_date}.diff" || return 1
   # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c 
-  mkdir -p ${startdir}/pkg/var/lib/hwclock
-  ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-rdev
+  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c || return 1
+  mkdir -p "${pkgdir}/var/lib/hwclock" || return 1
+  ./configure --enable-arch --enable-write --enable-raw --disable-wall --enable-rdev || return 1
   make HAVE_SLN=yes ADD_RAW=yes || return 1
-  make HAVE_SLN=yes ADD_RAW=yes DESTDIR=${startdir}/pkg install || return 1
+  make HAVE_SLN=yes ADD_RAW=yes DESTDIR="${pkgdir}" install || return 1
   # remove files
-  rm -f ${pkgdir}/bin/kill
-  rm -f ${pkgdir}/usr/share/man/man1/kill.1
-  rm -f ${pkgdir}/usr/share/man/man5/nfs.5
-  rm -f ${pkgdir}/usr/share/info/dir
+  rm -f "${pkgdir}/bin/kill"
+  rm -f "${pkgdir}/usr/share/man/man1/kill.1"
+  rm -f "${pkgdir}/usr/share/man/man5/nfs.5"
+  rm -f "${pkgdir}/usr/share/info/dir"
+  gzip -9 "${pkgdir}/usr/share/info/ipc.info" || return 1
 }
-

Modified: util-linux-ng.install
===================================================================
--- util-linux-ng.install	2009-08-01 11:15:06 UTC (rev 48288)
+++ util-linux-ng.install	2009-08-01 11:17:19 UTC (rev 48289)
@@ -1,5 +1,5 @@
 infodir=/usr/share/info
-filelist=(ipc.info)
+filelist=(ipc.info.gz)
 
 post_install() {
  [ -x usr/bin/install-info ] || return 0