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

[Eric Bélanger]

    Date: Monday, October 8, 2012 @ 20:13:22
  Author: eric
Revision: 168341

upgpkg: nicotine 1.2.16-4

Update optdepends, Clean up PKGBUILD, Add python2 fix

Modified:
  nicotine/trunk/PKGBUILD

----------+
 PKGBUILD |   27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-08 23:42:19 UTC (rev 168340)
+++ PKGBUILD	2012-10-09 00:13:22 UTC (rev 168341)
@@ -5,33 +5,30 @@
 
 pkgname=nicotine
 pkgver=1.2.16
-pkgrel=3
+pkgrel=4
 pkgdesc="Soulseek music-sharing client, written in python"
-license=('GPL')
 arch=('i686' 'x86_64')
-depends=('pygtk>=2.14.1' 'mutagen')
-conflicts=(nicotine-plus)
-replaces=(nicotine-plus)
 url="http://sourceforge.net/projects/nicotine-plus/"
+license=('GPL')
+depends=('pygtk' 'mutagen')
+optdepends=('python2-geoip: to enable Geographical blocker')
 source=(http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2)
-optdepends=('python-sexy: To enable spell checking'
-	    'python-geoip: to enable Geographical blocker')
 md5sums=('ac7433c21ef619a37e079a7ae68da94a')
 
-
-
-
 build() {
-  cd ${srcdir}/${pkgname}+-${pkgver}
+  cd "${srcdir}/${pkgname}+-${pkgver}"
   sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476
-  python2 setup.py install --root=${pkgdir}
+  sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \
+    -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py
+
+  python2 setup.py install --root="${pkgdir}"
   cd trayicon
   python2 autogen.py
   make 
 }
 
 package() {
-  cd ${srcdir}/${pkgname}+-${pkgver}/trayicon
-  make DESTDIR=${pkgdir} install 
-  ln -s nicotine.py ${pkgdir}/usr/bin/nicotine 
+  cd "${srcdir}/${pkgname}+-${pkgver}/trayicon"
+  make DESTDIR="${pkgdir}" install 
+  ln -s nicotine.py "${pkgdir}/usr/bin/nicotine"
 }