[arch-commits] Commit in e2fsprogs/repos (testing-i686 testing-i686/PKGBUILD)

[Ronald van Haren]

    Date: Thursday, September 25, 2008 @ 18:02:43
  Author: ronald
Revision: 13091

Merged revisions 13083 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/e2fsprogs/trunk

........
  r13083 | ronald | 2008-09-25 23:52:51 +0200 (Thu, 25 Sep 2008) | 1 line
  
  upgpkg: e2fsprogs 1.41.1-2
........

Modified:
  e2fsprogs/repos/testing-i686/	(properties)
  e2fsprogs/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


Property changes on: e2fsprogs/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /e2fsprogs/trunk:1-12953
   + /e2fsprogs/trunk:1-13090

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-09-25 22:01:27 UTC (rev 13090)
+++ testing-i686/PKGBUILD	2008-09-25 22:02:43 UTC (rev 13091)
@@ -4,7 +4,7 @@
 
 pkgname=e2fsprogs
 pkgver=1.41.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ext2 filesystem utilities"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'MIT')
@@ -30,13 +30,13 @@
   patch -Np1 -i ../Makefile-fsck.static.patch || return 1
   
   make || return 1
-  make DESTDIR=${startdir}/pkg install install-libs
-  make -C ${startdir}/src/${pkgname}-${pkgver}/misc fsck.static || return 1
+  make DESTDIR=${pkgdir} install install-libs
+  make -C ${srcdir}/${pkgname}-${pkgver}/misc fsck.static || return 1
   
   install -D -m755 ${srcdir}/${pkgname}-${pkgver}/misc/fsck.static \
 	 ${pkgdir}/sbin/fsck.static
   
   sed -i -e 's/^AWK=.*/AWK=awk/' ${pkgdir}/usr/bin/compile_et || return 1
   
-  install -m644 ${startdir}/src/mke2fs.conf ${pkgdir}/etc/ || return 1
+  install -m644 ${srcdir}/mke2fs.conf ${pkgdir}/etc/ || return 1
 }