summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsben Haabendal2017-12-18 09:21:13 +0100
committerEsben Haabendal2017-12-18 09:22:44 +0100
commit25baa3c9c132198ab54c09648516ec6eea3334a2 (patch)
treea328416d10c634f31eeab27ab3ce5fbadc0a3b04
parent4af509459558c32b8dac7ff9d43c261dd3e3c107 (diff)
downloadaur-25baa3c9c132198ab54c09648516ec6eea3334a2.tar.gz
Update to 2.7.0.r11.05338d8
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 75b3636bc175..17460c4f21f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs-with-editor-git
pkgdesc = Use the Emacsclient as the of child processes
- pkgver = 2.6.0
+ pkgver = 2.7.0.r11.05338d8
pkgrel = 1
url = http://github.com/magit/with-editor
install = emacs-with-editor-git.install
@@ -8,6 +8,7 @@ pkgbase = emacs-with-editor-git
license = GPL3
depends = emacs>=24.4
provides = emacs-with-editor
+ conflicts = emacs-with-editor
source = git+https://github.com/magit/with-editor.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a7f67eac0171..886afb0f4547 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=emacs-with-editor-git
_github_org="magit"
_github_repo="with-editor"
-pkgver=2.6.0
+pkgver=2.7.0.r11.05338d8
pkgrel=1
pkgdesc="Use the Emacsclient as the $EDITOR of child processes"
arch=('any')
@@ -11,14 +11,14 @@ url="http://github.com/${_github_org}/${_github_repo}"
license=('GPL3')
depends=('emacs>=24.4')
provides=('emacs-with-editor')
+conflicts=('emacs-with-editor')
install="${pkgname}.install"
source=("git+https://github.com/${_github_org}/${_github_repo}.git")
md5sums=('SKIP')
pkgver() {
cd "$srcdir/${_github_repo}"
- # Latest annotated tag (release)
- git describe --abbrev=0 | sed 's/^v//'
+ printf "%s" "$(git describe --long | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g')"
}
build() {