summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgesh2024-06-22 22:49:26 +0300
committergesh2024-06-22 22:53:47 +0300
commitbca19680ef7b7c8f66f5c59aa3ca084ca9e5792a (patch)
tree1d8118c7c3f828443654a1c24c6ff827b4f64655
parent89b58ba90add6bee7c8d966ea26203ebddac6efa (diff)
downloadaur-bca19680ef7b7c8f66f5c59aa3ca084ca9e5792a.tar.gz
Simplify pkgver() logic
There's no need to second-guess upstream versioning -- we shouldn't be covering for upstream sometimes tagging releases a couple commits after they've bumped it in the cabal file.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD12
2 files changed, 4 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef9b5e9a3de2..4fbae66ab3f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pandoc-static-git
pkgdesc = Conversion between markup formats (static build, dynamic Lua support)
- pkgver = 3.2.r31.gd01f2ac51
+ pkgver = 3.2.r112.g2b60b1a1b
pkgrel = 1
url = https://pandoc.org
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index e7050eef93b9..bc61053105e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ shopt -s extglob
pkgname=pandoc-static-git
_pkgname="${pkgname%-static-git}"
-pkgver=3.2.r31.gd01f2ac51
+pkgver=3.2.r112.g2b60b1a1b
pkgrel=1
pkgdesc='Conversion between markup formats (static build, dynamic Lua support)'
url='https://pandoc.org'
@@ -25,14 +25,8 @@ sha512sums=('SKIP')
pkgver() {
cd "$_pkgname"
- eval "$(git for-each-ref --shell --sort=creatordate \
- --format 'git tag --force %(refname:lstrip=-1)rc %(refname)' \
- 'refs/**/rc/*' | tail -n1)"
- git tag --force \
- "$(awk -F' *: *' '$1 ~ /^[Vv]ersion/ { print $2 }' *.cabal)"-rc \
- "$(git blame -p -L /^[Vv]ersion:/,+1 *.cabal | head -n1 | cut -d' ' -f1)"
- git describe --tags --long --match '[0-9]*' --match 'v[0-9]*' \
- | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ git describe --tags --long --match 'pandoc-cli-*' \
+ | sed 's/^pandoc-cli-//;s/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {