summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Perez de Castro2018-02-21 18:30:27 +0000
committerAdrian Perez de Castro2018-02-21 18:30:27 +0000
commit41de202da75b1624536f2bf23db13ed6482a17d2 (patch)
tree1aaf24b3c2486f677ef1c706f9d526e47c693d85
parent1acb4e04aca84ea868dd9f238202abdcd56aee89 (diff)
downloadaur-41de202da75b1624536f2bf23db13ed6482a17d2.tar.gz
Fix pkgver() function and use the one from Arch Wiki
This changes the pkgver() function to use exactly the version suggested in the Arch Wiki: https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ec860c4ec993..78176a24d51d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wlroots-git
pkgdesc = Modular Wayland compositor library
- pkgver = r1924.2e7d8862
- pkgrel = 1
+ pkgver = r1924.2e7d886
+ pkgrel = 2
url = https://github.com/swaywm/wlroots
arch = x86_64
license = custom:MIT
diff --git a/PKGBUILD b/PKGBUILD
index 15972f1493b7..bd80a8bfd3db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Adrian Perez de Castro <aperez@igalia.com>
pkgname='wlroots-git'
-pkgver=r1924.2e7d8862
-pkgrel=1
+pkgver=r1924.2e7d886
+pkgrel=2
license=('custom:MIT')
pkgdesc='Modular Wayland compositor library'
url='https://github.com/swaywm/wlroots'
@@ -20,7 +20,7 @@ pkgver () {
cd "${pkgname}"
(
set -o pipefail
- git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | sed 's/^version\.//' ||
+ git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
)
}