diff options
| author | Whyme Lyu | 2019-12-25 01:33:20 +0800 |
|---|---|---|
| committer | Whyme Lyu | 2019-12-25 01:33:20 +0800 |
| commit | 5a704d3626248457a842330b26181774729f7d67 (patch) | |
| tree | e285379f2162377f0091f1d71b46c705d059a75a | |
| parent | f4069edb4f1138f73a42dbbcb7580a9e376c715a (diff) | |
| download | aur-5a704d3626248457a842330b26181774729f7d67.tar.gz | |
PKGBUILD for 0.3.0
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 8 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = p3wm-git pkgdesc = 3-way merge .pacnew files - pkgver = 0.2.0.r0.8f10dd0 + pkgver = 0.3.0.r1.645a948 pkgrel = 1 url = https://github.com/5long/p3wm arch = any @@ -9,12 +9,14 @@ pkgbase = p3wm-git makedepends = asciidoctor depends = bash depends = coreutils - depends = git depends = pacman depends = sed depends = tar - optdepends = meld: default merge tool - optdepends = vim: default merge tool + optdepends = git: default merge tool + optdepends = rcs: default merge tool + optdepends = kdiff3: default resolve tool + optdepends = meld: default resolve tool + optdepends = vim: default resolve tool provides = p3wm conflicts = p3wm source = git+https://github.com/5long/p3wm @@ -1,7 +1,7 @@ # Maintainer: Whyme Lyu <callme5long@gmail.com> _pkgname=p3wm pkgname=p3wm-git -pkgver=0.2.0.r0.8f10dd0 # not used anyway +pkgver=0.3.0.r1.645a948 # not used anyway pkgrel=1 pkgdesc="3-way merge .pacnew files" arch=('any') @@ -30,7 +30,7 @@ sha256sums=('SKIP') pkgver() { cd "$_pkgname" - printf "%s" "$(git describe --tags --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')" + printf "%s" "$(git describe --tags --long | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g')" } build() { |