Date: Monday, February 4, 2013 @ 11:00:06 Author: arodseth Revision: 83646
archrelease: copy trunk to community-x86_64, community-i686 Added: nicotine/repos/community-i686/PKGBUILD (from rev 83645, nicotine/trunk/PKGBUILD) nicotine/repos/community-x86_64/PKGBUILD (from rev 83645, nicotine/trunk/PKGBUILD) Deleted: nicotine/repos/community-i686/PKGBUILD nicotine/repos/community-x86_64/PKGBUILD ---------------------------+ community-i686/PKGBUILD | 78 ++++++++++++++++++++++++-------------------- community-x86_64/PKGBUILD | 78 ++++++++++++++++++++++++-------------------- 2 files changed, 88 insertions(+), 68 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-02-04 09:59:51 UTC (rev 83645) +++ community-i686/PKGBUILD 2013-02-04 10:00:06 UTC (rev 83646) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Contributor: Hugo Doria <h...@archlinux.org> -# Contributor: Andrew Wright <andr...@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" -} Copied: nicotine/repos/community-i686/PKGBUILD (from rev 83645, nicotine/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-02-04 10:00:06 UTC (rev 83646) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Hugo Doria <h...@archlinux.org> +# Contributor: Andrew Wright <andr...@photism.org> + +pkgname=nicotine +pkgver=1.2.16 +pkgrel=4 +pkgdesc='Soulseek music-sharing client, written in python' +arch=('x86_64' 'i686') +url='http://sourceforge.net/projects/nicotine-plus/' +license=('GPL') +depends=('pygtk' 'mutagen') +makedepends=('setconf') +optdepends=('python2-geoip: to enable Geographical blocker') +source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2") +sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d') + +build() { + cd "$srcdir/${pkgname}+-$pkgver" + + # Fix for FS#22476 + setconf files/nicotine.desktop Icon nicotine-plus-32px + + # Python fix + sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \ + -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py + + cd trayicon + python2 autogen.py + make +} + +package() { + cd "$srcdir/${pkgname}+-$pkgver" + + python2 setup.py install --root="$pkgdir" + cd trayicon + make DESTDIR="$pkgdir" install + ln -s nicotine.py "$pkgdir/usr/bin/nicotine" +} + +# vim:set ts=2 sw=2 et: Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-02-04 09:59:51 UTC (rev 83645) +++ community-x86_64/PKGBUILD 2013-02-04 10:00:06 UTC (rev 83646) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Angel Velasquez <an...@archlinux.org> -# Contributor: Hugo Doria <h...@archlinux.org> -# Contributor: Andrew Wright <andr...@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" -} Copied: nicotine/repos/community-x86_64/PKGBUILD (from rev 83645, nicotine/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-02-04 10:00:06 UTC (rev 83646) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Hugo Doria <h...@archlinux.org> +# Contributor: Andrew Wright <andr...@photism.org> + +pkgname=nicotine +pkgver=1.2.16 +pkgrel=4 +pkgdesc='Soulseek music-sharing client, written in python' +arch=('x86_64' 'i686') +url='http://sourceforge.net/projects/nicotine-plus/' +license=('GPL') +depends=('pygtk' 'mutagen') +makedepends=('setconf') +optdepends=('python2-geoip: to enable Geographical blocker') +source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2") +sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d') + +build() { + cd "$srcdir/${pkgname}+-$pkgver" + + # Fix for FS#22476 + setconf files/nicotine.desktop Icon nicotine-plus-32px + + # Python fix + sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \ + -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py + + cd trayicon + python2 autogen.py + make +} + +package() { + cd "$srcdir/${pkgname}+-$pkgver" + + python2 setup.py install --root="$pkgdir" + cd trayicon + make DESTDIR="$pkgdir" install + ln -s nicotine.py "$pkgdir/usr/bin/nicotine" +} + +# vim:set ts=2 sw=2 et: