[arch-commits] Commit in nicotine/repos/extra-i686 (PKGBUILD)

[Hugo Doria]

    Date: Wednesday, January 21, 2009 @ 05:07:33
  Author: hugo
Revision: 24817

resolving conflicts

Modified:
  nicotine/repos/extra-i686/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-21 09:55:12 UTC (rev 24816)
+++ PKGBUILD	2009-01-21 10:07:33 UTC (rev 24817)
@@ -1,10 +1,10 @@
 # $Id$
-# Maintainer: Jan de Groot <jan at jgc.homeip.net>
+# Maintainer: Hugo Doria <hugo at archlinux.org>
 # Contributor: Andrew Wright <andreww at photism.org>
 
 pkgname=nicotine
-pkgver=1.2.9
-pkgrel=1
+pkgver=1.2.10
+pkgrel=2
 pkgdesc="Soulseek music-sharing client, written in python"
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -13,13 +13,14 @@
 replaces=(nicotine-plus)
 url="http://nicotine-plus.sourceforge.net"
 source=(http://downloads.sf.net/${pkgname}-plus/${pkgname}+-${pkgver}.tar.bz2)
-md5sums=('3e310418e4ea8ba9f0bdb240f82feb27')
+md5sums=('80f17b222b9bd33acc1ac64f77bef640')
 
 build() {
-  cd ${startdir}/src/${pkgname}+-${pkgver}
-  python setup.py install --root=${startdir}/pkg
+  cd ${srcdir}/${pkgname}+-${pkgver}
+  python setup.py install --root=${pkgdir}
   cd trayicon
   python autogen.py
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR=${pkgdir} install || return 1
 }
+