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

[Eric Bélanger]

    Date: Friday, June 24, 2011 @ 00:50:44
  Author: eric
Revision: 128489

upgpkg: catdoc 0.94.2-3
Rebuilt against latest toolchain, PKGBUILD cleanup

Modified:
  catdoc/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-24 04:38:08 UTC (rev 128488)
+++ PKGBUILD	2011-06-24 04:50:44 UTC (rev 128489)
@@ -4,9 +4,9 @@
 
 pkgname=catdoc
 pkgver=0.94.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A convertor for Microsoft Word, Excel, PowerPoint and RTF Files to text"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.wagner.pp.ru/~vitus/software/catdoc/"
 license=('GPL')
 depends=('glibc')
@@ -16,9 +16,12 @@
 md5sums=('243e1680bb3e703616f5adecfee24491')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --with-wish=/usr/bin/wish || return 1
-  make || return 1
-  make installroot=$pkgdir mandir=/usr/share/man/man1 install || return 1
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr  --with-wish=/usr/bin/wish
+  make
 }
-# vim: ts=2 sw=2 et ft=sh
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make installroot="$pkgdir" mandir=/usr/share/man/man1 install
+}