upgpkg: rpm-tools-git 4.18.1.r463.g589fb0e3a-1

2 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 328ea5afad54..56f017413aa2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rpm-tools-git
 	pkgdesc = RPM Package Manager
-	pkgver = r17189.gf9b90179b
-	pkgrel = 2
+	pkgver = 4.18.1.r463.g589fb0e3a
+	pkgrel = 1
 	url = https://rpm.org/
 	arch = i686
 	arch = x86_64
@@ -18,7 +18,7 @@ pkgbase = rpm-tools-git
 	depends = nss
 	depends = popt
 	depends = zstd
-	provides = rpm-tools
+	provides = rpm-tools=4.18.1.r463.g589fb0e3a
 	provides = rpmextract
 	conflicts = rpm-tools
 	conflicts = rpmextract
@@ -28,4 +28,3 @@ pkgbase = rpm-tools-git
 	sha256sums = SKIP
 
 pkgname = rpm-tools-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 798bfa14f488..533ecc53ce30 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=rpm-tools-git
-pkgver=r17189.gf9b90179b
-pkgrel=2
+pkgver=4.18.1.r463.g589fb0e3a
+pkgrel=1
 pkgdesc="RPM Package Manager"
 arch=('i686' 'x86_64')
 url="https://rpm.org/"
 license=('GPL')
 depends=('glibc' 'elfutils' 'file' 'libarchive' 'libcap' 'lmdb' 'lua' 'nss' 'popt' 'zstd')
 makedepends=('git' 'python')
-provides=('rpm-tools' 'rpmextract')
+provides=("rpm-tools=$pkgver" 'rpmextract')
 conflicts=('rpm-tools' 'rpmextract')
 source=("git+https://github.com/rpm-software-management/rpm.git"
         "https://raw.githubusercontent.com/archlinux/svntogit-community/packages/rpm-tools/trunk/rpmextract.sh")
@@ -20,9 +20,10 @@ sha256sums=('SKIP'
 pkgver() {
   cd "rpm"
 
-  _rev=$(git rev-list --count --all)
+  _tag=$(git tag -l --sort -v:refname | grep -E '^rpm-[0-9\.]+-release' | 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/^rpm-//;s/-release//'
 }
 
 build() {