From 562e9876c5bb04dc1dcb2f71773d779c3b5258d4 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Sun, 16 Feb 2014 17:46:26 -0600
Subject: e2fsprogs: update binary path to /usr/bin refs #961

---
 abs/core/e2fsprogs/PKGBUILD | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/abs/core/e2fsprogs/PKGBUILD b/abs/core/e2fsprogs/PKGBUILD
index 96afe85..c20e5e7 100644
--- a/abs/core/e2fsprogs/PKGBUILD
+++ b/abs/core/e2fsprogs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162199 2012-06-23 12:13:06Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org> 
+# $Id: PKGBUILD 197436 2013-10-26 01:07:56Z allan $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=e2fsprogs
-pkgver=1.42.4
-pkgrel=1
+pkgver=1.42.8
+pkgrel=2
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'MIT')
@@ -15,8 +15,9 @@ makedepends=('bc')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'MIT-LICENSE')
 backup=('etc/mke2fs.conf')
+options=('staticlibs')
 install=${pkgname}.install
-sha1sums=('944002c1f8f1f87e7d2d53263346b001962bc1f9'
+sha1sums=('79cdb2374a9c0e68f01739598679db06d546b897'
           'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
 
 build() {
@@ -26,7 +27,7 @@ build() {
   sed -i '/init\.d/s|^|#|' misc/Makefile.in
 
   ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \
-      --enable-elf-shlibs --disable-fsck --disable-uuidd \
+      --sbindir=/usr/bin --enable-elf-shlibs --disable-fsck --disable-uuidd \
       --disable-libuuid --disable-libblkid
 
   make
@@ -37,11 +38,14 @@ package() {
   make DESTDIR="${pkgdir}" install install-libs
 
   sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et"
-  
+
   # remove references to build directory
   sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
   sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et"
 
+  # remove static libraries with a shared counterpart
+  rm ${pkgdir}/usr/lib/lib{com_err,e2p,ext2fs,ss}.a
+
   # install MIT license
   install -Dm644 "${srcdir}/MIT-LICENSE" \
     "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
-- 
cgit v0.12

