summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro A. López-Valencia2018-05-15 14:54:11 -0500
committerPedro A. López-Valencia2018-05-15 14:54:11 -0500
commit3694276a57dc383ed4004e059f6bee50e9a4f345 (patch)
treef3faa0521ba6888c66b2e7937cdc0b471ad20188
parentffa83cccdd949b82343384459abb61f631ec5a25 (diff)
downloadaur-3694276a57dc383ed4004e059f6bee50e9a4f345.tar.gz
27.0.50.133067
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD29
2 files changed, 21 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c332408647fd..ee41f8075afc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = emacs-git
pkgdesc = GNU Emacs. Development.
- pkgver = 27.0.50.132088
+ pkgver = 27.0.50.133067
pkgrel = 1
url = http://www.gnu.org/software/emacs/
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 822f09e43e94..ef3df507817e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -72,7 +72,7 @@ if [[ BRANCH = "emacs-26" ]]; then
else
pkgname=emacs-git
fi
-pkgver=27.0.50.132088
+pkgver=27.0.50.133067
pkgrel=1
pkgdesc="GNU Emacs. Development."
arch=('x86_64') # Arch Linux only. Users of derivatives are on their own.
@@ -158,15 +158,26 @@ md5sums=('SKIP')
#source=("emacs-git::git://git.sv.gnu.org/emacs.git#branch=$BRANCH")
#source=("emacs-git::git+https://git.savannah.gnu.org/emacs.git#branch=$BRANCH")
-pkgver() {
- cd "$srcdir/emacs-git"
-
- printf "%s.%s" \
- "$(grep AC_INIT configure.ac | \
- sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\?\).\+$/\1/')" \
- "$(git rev-list --count HEAD)"
-}
+if [[ $BRANCH = "master" ]]; then
+ pkgver() {
+ cd "$srcdir/emacs-git"
+ printf "%s.%s" \
+ "$(grep AC_INIT configure.ac | \
+ sed -e 's/^.\+\ \([0-9]\+\.[0-9]\+\.[0-9]\+\?\).\+$/\1/')" \
+ "$(git rev-list --count HEAD)"
+ }
+else
+ pkgver() {
+ cd "$srcdir/emacs-git"
+
+ printf "%s.%s" \
+ "$(grep AC_INIT configure.ac | \
+ awk '{split($0,a,","); print a[2]}' | \
+ sed -e 's/\ //g' )" \
+ "$(git rev-list --count HEAD)"
+ }
+fi
# There is no need to run autogen.sh after first checkout.
# Doing so, breaks incremental compilation.