Made `$pkgver` conform to guidelines (stripped leading `v`), added `=$pkgver` to `provides` entry.

2 files changed, 23 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6aff3df1c748..5c681f40dfdd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = raleigh-reloaded-git
 	pkgdesc = A GTK theme aiming to revive the classic Raleigh theme
-	pkgver = v1.1.r4.89ce481
+	pkgver = 1.5+6.r161.20230323.ca39c61
 	pkgrel = 1
 	url = https://github.com/vlastavesely/raleigh-reloaded
 	arch = any
 	license = GPL2
 	depends = gtk3
-	provides = raleigh-reloaded
+	provides = raleigh-reloaded=1.5+6.r161.20230323.ca39c61
 	conflicts = raleigh-reloaded
 	options = !strip
 	source = raleigh-reloaded::git+https://github.com/vlastavesely/raleigh-reloaded.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = raleigh-reloaded-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 3d107c0aa533..15196e1d49bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,36 @@
-# Maintainer: Michal Wojdyla <micwoj9292 at gmail dot com>
+# Maintainer: dreieck (https://aur.archlinux.org/account/dreieck)
+# Contributor: Michal Wojdyla (https://aur.archlinux.org/account/micwoj92)
 # Contributor: Darren Wu <$(base64 --decode <<<'ZGFycmVuMTk5NzA4MTBAZ21haWwuY29tCg==')>
 pkgname=raleigh-reloaded-git
-pkgver=v1.1.r4.89ce481
+pkgver=1.5+6.r161.20230323.ca39c61
 pkgrel=1
 pkgdesc="A GTK theme aiming to revive the classic Raleigh theme"
 arch=('any')
 url="https://github.com/vlastavesely/raleigh-reloaded"
 license=('GPL2')
 depends=('gtk3')
-provides=("${pkgname%-git}")
+provides=("${pkgname%-git}=${pkgver}")
 conflicts=("${pkgname%-git}")
 options=('!strip')
-source=('raleigh-reloaded::git+https://github.com/vlastavesely/raleigh-reloaded.git')
-md5sums=('SKIP')
+source=("${pkgname%-git}::git+${url}.git")
+sha256sums=('SKIP')
 
 pkgver() {
-	cd "$srcdir/${pkgname%-git}"
-	# Git, tags available
-	printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+  cd "$srcdir/${pkgname%-git}"
+  _ver="$(git describe --long | sed -E -e 's|^[vV]||' -e 's|-g[0-9a-f]*$||' | tr '-' '+')"
+  _rev="$(git rev-list --count HEAD)"
+  _date="$(git log -1 --date=format:"%Y%m%d" --format="%ad")"
+  _hash="$(git rev-parse --short HEAD)"
+
+  if [ -z "${_ver}" ]; then
+    error "Version could not be determined."
+    return 1
+  else
+    printf '%s' "${_ver}.r${_rev}.${_date}.${_hash}"
+  fi
 }
 
 package() {
-	cd "$srcdir/${pkgname%-git}"
-	make PREFIX="$pkgdir"/usr install
+  cd "$srcdir/${pkgname%-git}"
+  make PREFIX="$pkgdir"/usr install
 }