Date: Sunday, August 29, 2010 @ 12:35:30
Author: remy
Revision: 89161
upgpkg: bittorrent 5.2.2-3
Rebuild for python2.
Modified:
bittorrent/trunk/PKGBUILD
bittorrent/trunk/bttrack
----------+
PKGBUILD | 16 +++++++++++-----
bttrack | 4 ++--
2 files changed, 13 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-08-29 16:33:26 UTC (rev 89160)
+++ PKGBUILD 2010-08-29 16:35:30 UTC (rev 89161)
@@ -3,7 +3,7 @@
pkgname=bittorrent
pkgver=5.2.2
-pkgrel=2
+pkgrel=3
pkgdesc="BitTorrent is a tool for copying files from one machine to another."
arch=('i686' 'x86_64')
url="http://www.bittorrent.com";
@@ -14,16 +14,22 @@
bttrack bttrack.conf)
license=('custom')
md5sums=('d8891cfa4c6bb796c8e948eace7694bc'
- '641d7bd82a40e84a837db465e6a28e0d'
+ 'b05f82b3a8e7fd8e7451064a9ae84ad2'
'29b1f592615d0a0fcf6099bd619bbd9c')
-build() {
+package() {
cd $srcdir/BitTorrent-$pkgver
- python ./setup.py install --root=$pkgdir
+ # the setup script wants to write something in $HOME...
+ export HOME=$srcdir
+ python2 ./setup.py install --root=$pkgdir
+ # fix python name
+ sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+ -i "${pkgdir}"/usr/lib/python2.7/site-packages/*/*.py
+
# remove broken wx interface
rm $pkgdir/usr/bin/{bittorrent,maketorrent}
- rm -rf $pkgdir/usr/lib/python2.6/site-packages/BitTorrent/GUI_wx
+ rm -rf $pkgdir/usr/lib/python2.7/site-packages/BitTorrent/GUI_wx
rm -rf $pkgdir/usr/share/pixmaps
# install custom license
Modified: bttrack
===================================================================
--- bttrack 2010-08-29 16:33:26 UTC (rev 89160)
+++ bttrack 2010-08-29 16:35:30 UTC (rev 89161)
@@ -4,13 +4,13 @@
. /etc/rc.conf
. /etc/rc.d/functions
-PID=`pidof -o %PPID /usr/bin/python /usr/bin/bittorrent-tracker`
+PID=`pidof -o %PPID /usr/bin/python2 /usr/bin/bittorrent-tracker`
case "$1" in
start)
stat_busy "Starting Bittorrent Tracker"
if [ -z "$PID" ]; then
- /usr/bin/python /usr/bin/bittorrent-tracker `sed
's/[#].*$//' /etc/bttrack.conf` >> /var/log/bttrack.log &
+ /usr/bin/python2 /usr/bin/bittorrent-tracker `sed
's/[#].*$//' /etc/bttrack.conf` >> /var/log/bttrack.log &
if [ $? -gt 0 ]; then
stat_fail
else
