[arch-commits] Commit in scrot/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Bélanger]

    Date: Friday, April 17, 2009 @ 22:02:36
  Author: eric
Revision: 35885

Fixed svn conflict

Modified:
  scrot/repos/extra-x86_64/	(properties)
  scrot/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)


Property changes on: scrot/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /scrot/trunk:1
   + /scrot/trunk:1-35884

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-18 02:01:14 UTC (rev 35884)
+++ extra-x86_64/PKGBUILD	2009-04-18 02:02:36 UTC (rev 35885)
@@ -2,17 +2,19 @@
 # Maintainer: Mark Rosenstand <mark at archlinux.org>
 pkgname=scrot
 pkgver=0.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A simple command-line screenshot utility for X"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://linuxbrit.co.uk/scrot/"
+license=('MIT')
 depends=('giblib')
 source=(http://linuxbrit.co.uk/downloads/$pkgname-$pkgver.tar.gz)
 md5sums=('ccae904d225609571bdd3b03445c1e88')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install
+  make DESTDIR=$pkgdir docsdir=/usr/share/doc/scrot install || return 1
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }