upgpkg: m4-git 1.4.19.r994.gd69fa528-1

2 files changed, 10 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a5e53327dda..cafea706dcc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = m4-git
 	pkgdesc = The GNU macro processor
-	pkgver = r359.gd69fa528
-	pkgrel = 2
+	pkgver = 1.4.19.r994.gd69fa528
+	pkgrel = 1
 	url = https://www.gnu.org/software/m4/m4.html
 	arch = i686
 	arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = m4-git
 	makedepends = rsync
 	makedepends = texinfo
 	depends = glibc
-	provides = m4
+	provides = m4=1.4.19.r994.gd69fa528
 	conflicts = m4
 	source = git+https://git.savannah.gnu.org/git/m4.git#branch=branch-2.0
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8aa940791815..6804c7f7cd58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=m4-git
-pkgver=r359.gd69fa528
-pkgrel=2
+pkgver=1.4.19.r994.gd69fa528
+pkgrel=1
 pkgdesc="The GNU macro processor"
 arch=('i686' 'x86_64')
 url="https://www.gnu.org/software/m4/m4.html"
 license=('GPL3')
 depends=('glibc')
 makedepends=('git' 'gettext' 'gperf' 'help2man' 'rsync' 'texinfo')
-provides=('m4')
+provides=("m4=$pkgver")
 conflicts=('m4')
 source=("git+https://git.savannah.gnu.org/git/m4.git#branch=branch-2.0")
 sha256sums=('SKIP')
@@ -18,7 +18,10 @@ sha256sums=('SKIP')
 pkgver() {
   cd "m4"
 
-  git describe --long --tags | sed 's/^cvs-readonly-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  _tag=$(git tag -l --sort -creatordate | grep -E '^v?[0-9\.]+' | head -n1)
+  _rev=$(git rev-list --count $_tag..HEAD)
+  _hash=$(git rev-parse --short HEAD)
+  printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//'
 }
 
 build() {