summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2019-09-02 00:01:10 +0300
committerYurii Kolesnykov2019-09-02 00:01:10 +0300
commitc17a25f78ecde0e757eb741c531988eb405f9611 (patch)
tree994879c3bd1d8b4e37d12daab96c06556ff4e7b7
parent8b63308fcf2fcf94e10390f650bb8cd37f4d2e1d (diff)
downloadaur-c17a25f78ecde0e757eb741c531988eb405f9611.tar.gz
fix pkgver
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d55a262d79a..73e5bc8f7c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = xorg-server-git
- pkgver = 1.20.0.419.r17053.g7d0e660e0
+ pkgver = 1.20.0.r419.g7d0e660e0
pkgrel = 1
url = https://gitlab.freedesktop.org/xorg/xserver.git
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index a0b8d17abe0..a6524fa630f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=(
'xorg-server-common-git'
'xorg-server-devel-git')
_pkgbase='xserver'
-pkgver=1.20.0.419.r17053.g7d0e660e0
+pkgver=1.20.0.r419.g7d0e660e0
pkgrel=1
arch=('x86_64')
license=('custom')
@@ -34,8 +34,8 @@ sha256sums=('SKIP'
pkgver() {
cd "${_pkgbase}"
- # cutting off 'foo-' prefix that presents in the git tag
- echo $(git describe --long | cut -d "-" -f3-4 | tr - .).r$(git rev-list HEAD --count).$(git describe --long | cut -d "-" -f5)
+ # cutting off 'xorg.server.' prefix that presents in the git tag
+ git describe --long --tags| sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {