[arch-commits] Commit in abs/trunk (PKGBUILD)

[Allan McRae]

    Date: Saturday, October 2, 2010 @ 03:29:32
  Author: allan
Revision: 92956

upgpkg: abs 2.4.0-1
upstream update

Modified:
  abs/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-02 00:15:29 UTC (rev 92955)
+++ PKGBUILD	2010-10-02 07:29:32 UTC (rev 92956)
@@ -2,7 +2,7 @@
 # Maintainer: Allan McRae <allan at archlinux.org>
 
 pkgname=abs
-pkgver=2.3.4.1
+pkgver=2.4.0
 pkgrel=1
 pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
 arch=('i686' 'x86_64')
@@ -12,20 +12,23 @@
 backup=(etc/abs.conf)
 install=abs.install
 source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz)
-md5sums=('286825d64f19f801d510ff1f7cc05ea6')
+md5sums=('4b845bc583489484e9c649228d72de5c')
 
 build() {
   cd ${srcdir}/${pkgname}
 
-  make CONFDIR=/etc/ || return 1
-  make CONFDIR=/etc/ DESTDIR=${pkgdir} install || return 1
+  make CONFDIR=/etc/
+  make CONFDIR=/etc/ DESTDIR=${pkgdir} install
 
   # Add readme file, and make base /var/abs path
   install -dm0755 ${pkgdir}/var/abs/local/
   install -Dm0644 ${srcdir}/abs/README ${pkgdir}/var/abs/README
 
-  # change ABS tags for x86_64 to correct values
-  if [ "$CARCH" = "x86_64" ]; then
-    sed -i 's|"i686"|"x86_64"|g' ${pkgdir}/etc/abs.conf
+  # make adjustments to abs.conf
+  if [[ $CARCH = "i686" ]]; then
+    sed -i 's| multilib||'  ${pkgdir}/etc/abs.conf
   fi
+  if [[ $CARCH = "x86_64" ]]; then
+    sed -i '/ARCH=/s|i686|x86_64|' ${pkgdir}/etc/abs.conf
+  fi
 }