upgpkg: prplmesh-git 4.0.1.r156.g6cd1ed230-1

2 files changed, 7 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04d2203f7e49..b9b0e091c38a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = prplmesh-git
 	pkgdesc = WFA Multi-AP implementation
-	pkgver = r4893.g96b2d694
+	pkgver = 4.0.1.r156.g6cd1ed230
 	pkgrel = 1
 	url = https://prplfoundation.org/prplmesh/
 	arch = i686
@@ -19,8 +19,7 @@ pkgbase = prplmesh-git
 	depends = zeromq
 	provides = prplmesh
 	conflicts = prplmesh
-	source = git+https://github.com/prplfoundation/prplMesh.git
+	source = git+https://gitlab.com/prpl-foundation/prplmesh/prplMesh.git
 	sha256sums = SKIP
 
 pkgname = prplmesh-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 2577f93a70a4..1097b276f355 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=prplmesh-git
-pkgver=r4893.g96b2d694
+pkgver=4.0.1.r156.g6cd1ed230
 pkgrel=1
 pkgdesc="WFA Multi-AP implementation"
 arch=('i686' 'x86_64')
@@ -11,16 +11,17 @@ depends=('glibc' 'json-c' 'ncurses' 'openssl' 'readline' 'zeromq')
 makedepends=('git' 'cmake' 'libnl' 'python-yaml')
 provides=('prplmesh')
 conflicts=('prplmesh')
-source=("git+https://github.com/prplfoundation/prplMesh.git")
+source=("git+https://gitlab.com/prpl-foundation/prplmesh/prplMesh.git")
 sha256sums=('SKIP')
 
 
 pkgver() {
   cd "prplMesh"
 
-  _rev=$(git rev-list --count --all)
+  _tag=$(git tag -l --sort -v:refname | grep -E '^v?[0-9\.]+$' | head -n1)
+  _rev=$(git rev-list --count $_tag..HEAD)
   _hash=$(git rev-parse --short HEAD)
-  printf "r%s.g%s" "$_rev" "$_hash"
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//'
 }
 
 build() {