Smarter pkgver()

2 files changed, 4 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d2ac75b7fc3..af76e02164ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = akonadi-calendar-git
 	pkgdesc = Akonadi calendar integration
-	pkgver = 5.17.40_r1939.gb9233c7
+	pkgver = 5.18.40_r1958.gbaae021
 	pkgrel = 1
 	url = https://kontact.kde.org
 	arch = x86_64
@@ -18,4 +18,3 @@ pkgbase = akonadi-calendar-git
 	sha256sums = SKIP
 
 pkgname = akonadi-calendar-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 4f989eceb5bf..f87f0773e40c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Antonio Rojas <arojas@archlinux.org>
 
 pkgname=akonadi-calendar-git
-pkgver=5.17.40_r1939.gb9233c7
+pkgver=5.18.40_r1958.gbaae021
 pkgrel=1
 pkgdesc="Akonadi calendar integration"
 arch=($CARCH)
@@ -19,7 +19,8 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd ${pkgname%-git}
-  _ver="$(grep -m1 'set(PIM_VERSION' CMakeLists.txt | cut -d '"' -f2 | tr - .)"
+  _ver="$(grep -m1 -e 'set(RELEASE_SERVICE_VERSION' CMakeLists.txt | cut -d '"' -f2 | tr - .)"
+  _ver=${_ver:-"$(grep -m1 'set(PIM_VERSION' CMakeLists.txt | cut -d '"' -f2 | tr - .)"}
   echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }