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

[Allan McRae]

    Date: Saturday, December 25, 2010 @ 05:42:37
  Author: allan
Revision: 104009

upgpkg: e2fsprogs 1.41.14-1
upstream update, remove  reference

Modified:
  e2fsprogs/trunk/PKGBUILD
  e2fsprogs/trunk/e2fsprogs.install

-------------------+
 PKGBUILD          |   22 ++++++++++++----------
 e2fsprogs.install |    2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-25 10:25:42 UTC (rev 104008)
+++ PKGBUILD	2010-12-25 10:42:37 UTC (rev 104009)
@@ -3,7 +3,7 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=e2fsprogs
-pkgver=1.41.12
+pkgver=1.41.14
 pkgrel=1
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64')
@@ -16,31 +16,33 @@
         'MIT-LICENSE')
 backup=('etc/mke2fs.conf')
 install=${pkgname}.install
-sha1sums=('62b002fe507b2ddafc24b89532e472fe4b55a14f'
+sha1sums=('24f9364fa3d4c0d7d00cb627b819d0e51055d6c5'
           'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # Remove unnecessary init.d directory
-  sed -i '/init\.d/s|^|#|' misc/Makefile.in || return 1
+  sed -i '/init\.d/s|^|#|' misc/Makefile.in
 
   ./configure --prefix=/usr --with-root-prefix="" --enable-elf-shlibs \
       --disable-fsck --disable-uuidd \
-      --disable-libuuid --disable-libblkid || return 1
+      --disable-libuuid --disable-libblkid
 
-
-  make || return 1
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install install-libs || return 1
+  make DESTDIR="${pkgdir}" install install-libs
 
-  sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" || return 1
+  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"
 
   # install MIT license
   install -Dm644 "${srcdir}/MIT-LICENSE" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" || return 1
-
+    "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
 }

Modified: e2fsprogs.install
===================================================================
--- e2fsprogs.install	2010-12-25 10:25:42 UTC (rev 104008)
+++ e2fsprogs.install	2010-12-25 10:42:37 UTC (rev 104009)
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(libext2fs.info.gz)
 
 post_install() {