Minor improvement

2 files changed, 37 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 834b72c44a40..1750016f652f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 # Generated by makepkg 5.1.1
-# Thu Sep 13 11:40:33 UTC 2018
+# Thu Sep 20 10:38:19 UTC 2018
 pkgbase = viking-git
 	pkgdesc = GTK+2 application to manage GPS data
-	pkgver = 1.6.2.r3301.ec789f15
+	pkgver = 1.6.2.r3307.2a5bafd2
 	pkgrel = 1
 	url = http://viking-gps.github.io/
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = python
 	makedepends = boost
 	makedepends = gnome-doc-utils
 	makedepends = intltool
+	makedepends = python
 	depends = curl
 	depends = file
 	depends = gpsd
@@ -20,7 +20,7 @@ pkgbase = viking-git
 	depends = mapnik
 	depends = liboauth
 	optdepends = gpsbabel: import and export GPS tracks from various formats
-	provides = viking=1.6.2.r3301.ec789f15
+	provides = viking=1.6.2.r3307.2a5bafd2
 	conflicts = viking
 	source = https://github.com/viking-gps/viking/archive/master.tar.gz
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 62ee49e6ed14..575d68c4c243 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,41 +5,52 @@
 _orgname=viking-gps
 _pkgname=viking
 _branch=master
+_use_gh_api=true
 pkgname=${_pkgname}-git
-pkgver=1.6.2.r3301.ec789f15
+pkgver=1.6.2.r3307.2a5bafd2
 pkgrel=1
 pkgdesc="GTK+2 application to manage GPS data"
 arch=('i686' 'x86_64')
 url="http://viking-gps.github.io/"
 license=('GPL2')
 depends=('curl' 'file' 'gpsd' 'gtk2' 'libgexiv2' 'mapnik' 'liboauth')
-#makedepends=('git' 'boost' 'gnome-doc-utils' 'intltool')
-makedepends=('python' 'boost' 'gnome-doc-utils' 'intltool')
+makedepends=('boost' 'gnome-doc-utils' 'intltool')
+if [ "${_use_gh_api}" = true ]; then
+  makedepends+=('python')
+else
+  makedepends+=('git')
+fi
 optdepends=('gpsbabel: import and export GPS tracks from various formats')
 provides=("${pkgname//-git}=${pkgver}")
 conflicts=(${pkgname//-git})
-#source=("${_pkgname}-${_branch}::git://github.com/${_orgname}/${_pkgname}.git#branch=${_branch}")
-source=("https://github.com/${_orgname}/${_pkgname}/archive/${_branch}.tar.gz")
+if [ "${_use_gh_api}" = true ]; then
+  source=("https://github.com/${_orgname}/${_pkgname}/archive/${_branch}.tar.gz")
+else
+  source=("${_pkgname}-${_branch}::git://github.com/${_orgname}/${_pkgname}.git#branch=${_branch}")
+fi
 sha256sums=('SKIP')
 
-#pkgver() {
-#  cd ${_pkgname}-${_branch}
-#
-#  RELEASE="$(git describe --tags $(git rev-list --tags --max-count=1))"
-#  REVISION="$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
-#  printf "%s.r%s" "${RELEASE#viking-}" "${REVISION}"
-#}
-
 pkgver() {
-  api_url="https://api.github.com/repos/${_orgname}/${_pkgname}"
-  base="029f2f53"
-  head=$(curl -s "$api_url/git/refs/heads/${_branch}" | \
-    python -c "import sys, json; print(json.load(sys.stdin)['object']['sha'][:8])")
-  count=$(curl -s "$api_url/compare/${base}...${head}" | \
-    python -c "import sys, json; print(json.load(sys.stdin)['total_commits'] + 1)")
-  release=$(curl -s "$api_url/tags" | \
-    python -c "import sys, json; r = json.load(sys.stdin)[0]; print(r['name'])")
-  printf "%s.r%s.%s" "${release#viking-}" "${count}" "${head}"
+  cd ${_pkgname}-${_branch}
+
+  if [ "${_use_gh_api}" = true ]; then
+    api_url="https://api.github.com/repos/${_orgname}/${_pkgname}"
+    base="029f2f53"
+    head=$(curl -s "$api_url/git/refs/heads/${_branch}" | \
+      python -c "import sys, json; print(json.load(sys.stdin)['object']['sha'][:8])")
+    count=$(curl -s "$api_url/compare/${base}...${head}" | \
+      python -c "import sys, json; print(json.load(sys.stdin)['total_commits'] + 1)")
+    release=$(curl -s "$api_url/tags" | \
+      python -c "import sys, json; r = json.load(sys.stdin)[0]; print(r['name'])")
+  else
+    release="$(git describe --tags $(git rev-list --tags --max-count=1))"
+    count="$(git rev-list --count HEAD)"
+    head="$(git rev-parse --short HEAD)"
+  fi
+
+  release=${release#viking-}
+  release=${release//-/.} # pkgver is not allowed to contain hyphens
+  printf "%s.r%s.%s" "${release}" "${count}" "${head}"
 }
 
 prepare() {