[arch-commits] Commit in nicotine/repos (4 files)

[Eric Bélanger]

    Date: Monday, October 8, 2012 @ 20:13:39
  Author: eric
Revision: 168342

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nicotine/repos/extra-i686/PKGBUILD
    (from rev 168341, nicotine/trunk/PKGBUILD)
  nicotine/repos/extra-x86_64/PKGBUILD
    (from rev 168341, nicotine/trunk/PKGBUILD)
Deleted:
  nicotine/repos/extra-i686/PKGBUILD
  nicotine/repos/extra-x86_64/PKGBUILD

-----------------------+
 extra-i686/PKGBUILD   |   71 ++++++++++++++++++++++--------------------------
 extra-x86_64/PKGBUILD |   71 ++++++++++++++++++++++--------------------------
 2 files changed, 68 insertions(+), 74 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-10-09 00:13:22 UTC (rev 168341)
+++ extra-i686/PKGBUILD	2012-10-09 00:13:39 UTC (rev 168342)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-# Contributor: Andrew Wright <andreww at photism.org>
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=3
-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/"
-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}
-  sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476
-  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 
-}

Copied: nicotine/repos/extra-i686/PKGBUILD (from rev 168341, nicotine/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-10-09 00:13:39 UTC (rev 168342)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+# Contributor: Andrew Wright <andreww at photism.org>
+
+pkgname=nicotine
+pkgver=1.2.16
+pkgrel=4
+pkgdesc="Soulseek music-sharing client, written in python"
+arch=('i686' 'x86_64')
+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)
+md5sums=('ac7433c21ef619a37e079a7ae68da94a')
+
+build() {
+  cd "${srcdir}/${pkgname}+-${pkgver}"
+  sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476
+  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"
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-10-09 00:13:22 UTC (rev 168341)
+++ extra-x86_64/PKGBUILD	2012-10-09 00:13:39 UTC (rev 168342)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-# Contributor: Andrew Wright <andreww at photism.org>
-
-pkgname=nicotine
-pkgver=1.2.16
-pkgrel=3
-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/"
-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}
-  sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476
-  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 
-}

Copied: nicotine/repos/extra-x86_64/PKGBUILD (from rev 168341, nicotine/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-10-09 00:13:39 UTC (rev 168342)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+# Contributor: Andrew Wright <andreww at photism.org>
+
+pkgname=nicotine
+pkgver=1.2.16
+pkgrel=4
+pkgdesc="Soulseek music-sharing client, written in python"
+arch=('i686' 'x86_64')
+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)
+md5sums=('ac7433c21ef619a37e079a7ae68da94a')
+
+build() {
+  cd "${srcdir}/${pkgname}+-${pkgver}"
+  sed -i -e "s/Icon=nicotine-plus/Icon=nicotine-plus-32px/" files/nicotine.desktop # Fixing FS#22476
+  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"
+}