2019-11-04 1572843648

2 files changed, 23 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ac0a8e5415d..353e25540876 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = qsyncthingtray-git
 	pkgdesc = Syncs files among devices, and shows the sync status on a tray icon. Version with the latest unreleased improvements.
-	pkgver = r421.11936bc
-	pkgrel = 2
+	pkgver = 421
+	pkgrel = 3
 	url = https://github.com/sieren/QSyncthingTray
 	arch = i686
 	arch = x86_64
 	license = LGPL3
 	makedepends = cmake
+	makedepends = commits-count-git
 	makedepends = git
 	depends = qt5-location
 	depends = qt5-webengine
diff --git a/PKGBUILD b/PKGBUILD
index e5cc8b042953..9a3a720c2581 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,9 @@
 #! /bin/bash
-
-Name="QSyncthingTray"
-LowercaseName=$(echo "${Name,,}")
-pkgname="${LowercaseName}-git"
-
-pkgver=r421.11936bc
-pkgrel=2
-arch=("i686" "x86_64")
-
-pkgdesc="Syncs files among devices, and shows the sync status on a tray icon. Version with the latest unreleased improvements."
-license=("LGPL3")
-
 url="https://github.com/sieren/QSyncthingTray"
-source=("git+${url}.git" "${LowercaseName}.desktop")
-md5sums=("SKIP" "SKIP")
-
-makedepends=("cmake" "git")
-depends=("qt5-location" "qt5-webengine" "startup-settings-git" "syncthing")
-provides=("${LowercaseName}")
-conflicts=("${LowercaseName}")
 
 
 pkgver() {
-	cd "${Name}"
-	printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	commitsCount "${url}"
 }
 
 
@@ -52,3 +32,22 @@ package() {
 	chmod +x "${pkgdir}/usr/bin/${LowercaseName}"
 }
 
+
+Name="QSyncthingTray"
+LowercaseName=$(echo "${Name,,}")
+provides=("${LowercaseName}")
+conflicts=("${LowercaseName}")
+pkgname="${LowercaseName}-git"
+
+pkgdesc="Syncs files among devices, and shows the sync status on a tray icon. Version with the latest unreleased improvements."
+license=("LGPL3")
+
+pkgver=$(pkgver)
+pkgrel=3
+arch=("i686" "x86_64")
+
+makedepends=("cmake" "commits-count-git" "git")
+depends=("qt5-location" "qt5-webengine" "startup-settings-git" "syncthing")
+source=("git+${url}.git" "${LowercaseName}.desktop")
+md5sums=("SKIP" "SKIP")
+