summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD22
-rw-r--r--pathfix.patch24
3 files changed, 21 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 374fedd5c01c..9af2e757e308 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Nov 20 15:38:01 UTC 2017
pkgbase = pytrainer
pkgdesc = A tool to log your sport activities.
- pkgver = 1.10.0
- pkgrel = 3
+ pkgver = 1.11.0
+ pkgrel = 1
url = https://github.com/pytrainer/pytrainer/wiki
arch = any
license = GPL
@@ -16,15 +18,12 @@ pkgbase = pytrainer
optdepends = gpsbabel: "Garmin via GPSBabel 1.3.5" plugin
optdepends = perl: garmin-fit plugin
optdepends = zenity: garmintools and gpsbabel plugins
- source = pytrainer-1.10.0.tar.gz::https://github.com/pytrainer/pytrainer/archive/v1.10.0.tar.gz
+ source = pytrainer-1.11.0.tar.gz::https://github.com/pytrainer/pytrainer/archive/v1.11.0.tar.gz
source = pytrainer.sh
- source = pathfix.patch
- md5sums = 66d2c18fccca2f862914f99c4110ccc4
+ md5sums = e81960234ca2e88ab8856032b62157a3
md5sums = b39a8511bc63e6d65a615d26defbb05f
- md5sums = c80aa188dce3a5675b15a703873bf3ad
- sha256sums = 3e019ab0bb564017e13e6d8736b23597fd9b21433ebfbe597ed5430c86b98250
+ sha256sums = 9e4d3e00dcce01871b0ddaa5a3c000f9b075cc996a593a5eac7e3bdb66604341
sha256sums = a0bd23c619d6c5c9bc79e90dba2b5951b3405c08764ca927de385b894759449c
- sha256sums = b098e66cbc0e0f53e1ee222eb313417c7589928b66ce7b756c677f73b964fe1e
pkgname = pytrainer
diff --git a/PKGBUILD b/PKGBUILD
index b4b5945b955b..c95871e68f2d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
# Contributor: Alexander Fehr <pizzapunk gmail com>
pkgname=pytrainer
-pkgver=1.10.0
-pkgrel=3
+pkgver=1.11.0
+pkgrel=1
pkgdesc='A tool to log your sport activities.'
arch=('any')
url='https://github.com/pytrainer/pytrainer/wiki'
@@ -19,18 +19,24 @@ optdepends=('garmintools: "Garmin via garmintools" 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=('66d2c18fccca2f862914f99c4110ccc4'
+ #pathfix.patch
+ )
+md5sums=('e81960234ca2e88ab8856032b62157a3'
'b39a8511bc63e6d65a615d26defbb05f'
- 'c80aa188dce3a5675b15a703873bf3ad')
-sha256sums=('3e019ab0bb564017e13e6d8736b23597fd9b21433ebfbe597ed5430c86b98250'
+ #'c80aa188dce3a5675b15a703873bf3ad'
+ )
+sha256sums=('9e4d3e00dcce01871b0ddaa5a3c000f9b075cc996a593a5eac7e3bdb66604341'
'a0bd23c619d6c5c9bc79e90dba2b5951b3405c08764ca927de385b894759449c'
- 'b098e66cbc0e0f53e1ee222eb313417c7589928b66ce7b756c677f73b964fe1e')
+ #'b098e66cbc0e0f53e1ee222eb313417c7589928b66ce7b756c677f73b964fe1e'
+ )
package() {
cd "$pkgname-$pkgver"
- patch -Np2 < "$srcdir/pathfix.patch"
+ #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
+
# Fix python paths
find "$srcdir/" -name '*.py' -exec \
diff --git a/pathfix.patch b/pathfix.patch
deleted file mode 100644
index 46581c3eb681..000000000000
--- a/pathfix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -crB src/pytrainer-1.8.0/bin/pytrainer src/pytrainer-1.8.0_2//bin/pytrainer
-*** src/pytrainer-1.8.0/bin/pytrainer 2010-11-30 00:58:12.000000000 +0200
---- src/pytrainer-1.8.0_2/bin/pytrainer 2011-01-13 20:39:27.536666679 +0200
-***************
-*** 77,85 ****
- gettext_path = base_path + "/locale"
- else:
- print("running pytrainer from egg installation")
-! data_path = base_path + "/share/pytrainer/"
- site_path = "%s/lib/python%s.%s/site-packages" % (base_path, ver[0], ver[1])
-! gettext_path = base_path + "/share/locale"
-
- print "data_path: " + data_path
- print "gettext_path: " + gettext_path
---- 77,85 ----
- gettext_path = base_path + "/locale"
- else:
- print("running pytrainer from egg installation")
-! data_path = base_path + "/pytrainer/"
- site_path = "%s/lib/python%s.%s/site-packages" % (base_path, ver[0], ver[1])
-! gettext_path = base_path + "/locale"
-
- print "data_path: " + data_path
- print "gettext_path: " + gettext_path