diff options
| author | Narrat | 2020-01-12 00:15:24 +0100 |
|---|---|---|
| committer | Narrat | 2020-01-12 00:15:24 +0100 |
| commit | 929fdc9f065cd8ea7aa97ef87aab1707e92c13d7 (patch) | |
| tree | b77c5aad4ce515bd7b52e120fb8ca5a7c94f3ebb | |
| parent | 646448c552b0d86e4ca7e4ba049987526b60ff57 (diff) | |
| download | aur-929fdc9f065cd8ea7aa97ef87aab1707e92c13d7.tar.gz | |
update to 2.0.1 + various
Switched from python2 to python3 and adjusted the deps according to the setup.py
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | PKGBUILD | 42 | ||||
| -rwxr-xr-x | pytrainer.sh | 2 |
3 files changed, 31 insertions, 33 deletions
@@ -1,25 +1,23 @@ pkgbase = pytrainer - pkgdesc = A tool to log your sport activities. - pkgver = 2.0.0 + pkgdesc = tool to log your sport activities. + pkgver = 2.0.1 pkgrel = 1 url = https://github.com/pytrainer/pytrainer/wiki arch = any license = GPL - depends = python2-distribute - depends = python2-lxml - depends = python2-matplotlib - depends = python2-sqlalchemy-migrate - depends = pywebkitgtk - depends = python2-sqlparse + depends = python-setuptools + depends = python-lxml + depends = python-matplotlib + depends = python-sqlalchemy-migrate optdepends = garmintools: "Garmin via garmintools" plugin optdepends = gdal: "Elevation correction" plugin optdepends = gpsbabel: "Garmin via GPSBabel 1.3.5" plugin optdepends = perl: garmin-fit plugin optdepends = zenity: garmintools and gpsbabel plugins - source = pytrainer-2.0.0.tar.gz::https://github.com/pytrainer/pytrainer/archive/v2.0.0.tar.gz + source = pytrainer-2.0.1.tar.gz::https://github.com/pytrainer/pytrainer/archive/v2.0.1.tar.gz source = pytrainer.sh - md5sums = 70c9e62bb9afa06ae7b7e44ec0eb5921 - md5sums = 87bc8c7037f17f0be158853485ef713f + md5sums = 4f72a99412a40be7e40f5b84c8744472 + md5sums = d29f67beb31028cf1ecdb85e71d31516 pkgname = pytrainer @@ -1,47 +1,47 @@ -# Maintainer: zoe < chp321 at gmail > +# Contributor: Lex Black <autumn-wind@web.de> +# Contributor: zoe < chp321 at gmail > # Contributor: D. Can Celasun <dcelasun at gmail> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=pytrainer -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 -pkgdesc='A tool to log your sport activities.' +pkgdesc='tool to log your sport activities.' arch=('any') url="https://github.com/${pkgname}/${pkgname}/wiki" license=('GPL') -depends=('python2-distribute' 'python2-lxml' 'python2-matplotlib' 'python2-sqlalchemy-migrate' 'pywebkitgtk' 'python2-sqlparse') +depends=('python-setuptools' 'python-lxml' 'python-matplotlib' + 'python-sqlalchemy-migrate') optdepends=('garmintools: "Garmin via garmintools" plugin' 'gdal: "Elevation correction" plugin' 'gpsbabel: "Garmin via GPSBabel 1.3.5" plugin' 'perl: garmin-fit plugin' 'zenity: garmintools and gpsbabel plugins') source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz" - ${pkgname}.sh - #pathfix.patch - ) -md5sums=('70c9e62bb9afa06ae7b7e44ec0eb5921' - '87bc8c7037f17f0be158853485ef713f' - #'c80aa188dce3a5675b15a703873bf3ad' - ) + ${pkgname}.sh) +md5sums=('4f72a99412a40be7e40f5b84c8744472' + 'd29f67beb31028cf1ecdb85e71d31516') -package() { +prepare() { cd "${pkgname}-${pkgver}" - #patch -Np2 < "${srcdir}/pathfix.patch" - sed -i 's/\/share\/pytrainer\//\/pytrainer\//' ${srcdir}/${pkgname}-${pkgver}/bin/${pkgname} - sed -i 's/\/share\/locale/\/locale/' ${srcdir}/${pkgname}-${pkgver}/bin/${pkgname} + sed -i 's/\/share\/pytrainer\//\/pytrainer\//' "${srcdir}/${pkgname}-${pkgver}/bin/${pkgname}" + sed -i 's/\/share\/locale/\/locale/' "${srcdir}/${pkgname}-${pkgver}/bin/${pkgname}" +} + +build() { + cd "${pkgname}-${pkgver}" + python setup.py build +} - # Fix python paths - find "${srcdir}/" -name '*.py' -exec \ - sed -ri 's@^#!\s*/usr/bin/(python|env python)$@#!/usr/bin/env python2@' {} + +package() { + cd "${pkgname}-${pkgver}" - # Install - export PYTHON="/usr/bin/env python2" - python2 setup.py install --prefix=/usr --root="${pkgdir}" + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build # install launcher mv "${pkgdir}"/usr/{bin,share/${pkgname}}/${pkgname} diff --git a/pytrainer.sh b/pytrainer.sh index 32cd360d5f2f..c3f926f1cdcd 100755 --- a/pytrainer.sh +++ b/pytrainer.sh @@ -9,4 +9,4 @@ wget -q -O ${HOME}/.pytrainer/tmp/cache/OpenLayers.js http://www.openlayers.org/ cd /usr/share/pytrainer -exec python2 pytrainer "$@" +exec python pytrainer "$@" |