Update from 2.0.0rc1 to 2.0.0

2 files changed, 18 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f749bd60da3b..54056619636b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Feb 12 22:22:37 UTC 2019
 pkgbase = pytrainer
 	pkgdesc = A tool to log your sport activities.
-	pkgver = 2.0.0rc1
-	pkgrel = 2
+	pkgver = 2.0.0
+	pkgrel = 1
 	url = https://github.com/pytrainer/pytrainer/wiki
 	arch = any
 	license = GPL
@@ -18,9 +16,9 @@ pkgbase = pytrainer
 	optdepends = gpsbabel: "Garmin via GPSBabel 1.3.5" plugin
 	optdepends = perl: garmin-fit plugin
 	optdepends = zenity: garmintools and gpsbabel plugins
-	source = pytrainer-2.0.0rc1.tar.gz::https://github.com/pytrainer/pytrainer/archive/v2.0.0rc1.tar.gz
+	source = pytrainer-2.0.0.tar.gz::https://github.com/pytrainer/pytrainer/archive/v2.0.0.tar.gz
 	source = pytrainer.sh
-	md5sums = 1a29bd8749a7ce218e1959e918b60211
+	md5sums = 70c9e62bb9afa06ae7b7e44ec0eb5921
 	md5sums = 87bc8c7037f17f0be158853485ef713f
 
 pkgname = pytrainer
diff --git a/PKGBUILD b/PKGBUILD
index c99622e86e6a..d1804ed2f532 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,11 @@
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=pytrainer
-pkgver=2.0.0rc1
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc='A tool to log your sport activities.'
 arch=('any')
-url='https://github.com/pytrainer/pytrainer/wiki'
+url="https://github.com/${pkgname}/${pkgname}/wiki"
 license=('GPL')
 depends=('python2-distribute' 'python2-lxml' 'python2-matplotlib' 'python2-sqlalchemy-migrate' 'pywebkitgtk' 'python2-sqlparse')
 optdepends=('garmintools: "Garmin via garmintools" plugin'
@@ -17,33 +17,33 @@ optdepends=('garmintools: "Garmin via garmintools" 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
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"
+        ${pkgname}.sh
         #pathfix.patch
         )
-md5sums=('1a29bd8749a7ce218e1959e918b60211'
+md5sums=('70c9e62bb9afa06ae7b7e44ec0eb5921'
          '87bc8c7037f17f0be158853485ef713f'
          #'c80aa188dce3a5675b15a703873bf3ad'
          )
 
 
 package() {
-  cd "$pkgname-$pkgver"
+  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
+  #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 \
+  find "${srcdir}/" -name '*.py' -exec \
     sed -ri 's@^#!\s*/usr/bin/(python|env python)$@#!/usr/bin/env python2@' {} +
 
   # Install
   export PYTHON="/usr/bin/env python2"
-  python2 setup.py install --prefix=/usr --root="$pkgdir"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}"
 
   # install launcher
-  mv "$pkgdir"/usr/{bin,share/$pkgname}/$pkgname
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+  mv "${pkgdir}"/usr/{bin,share/${pkgname}}/${pkgname}
+  install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
 }