summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordian Edenhofer2016-05-13 20:36:38 +0200
committerGordian Edenhofer2016-05-13 20:36:38 +0200
commitcc51a2c7a1ea1ff1d9081f6edd5e0b450edac71c (patch)
tree525a8d30f818bfd2e83f41d054a0e0849485cb7d
parent0ad9085482e71983de1c233291b52d0692569257 (diff)
downloadaur-cc51a2c7a1ea1ff1d9081f6edd5e0b450edac71c.tar.gz
upgpkg: slurm-llnl-git 16.05.0.0rc2.r73.g9de1598-1
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
2 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 03a2b6283e9a..6ff886c6015e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = slurm-llnl-git
pkgdesc = Simple Linux Utility for Resource Management (development version)
- pkgver = 27818.af1afa3
+ pkgver = 16.05.0.0rc2.r73.g9de1598
pkgrel = 1
url = http://www.schedmd.com
install = slurm-llnl-git.install
@@ -25,7 +25,7 @@ pkgbase = slurm-llnl-git
optdepends = numactl: NUMA support in the task/affinity plugin
optdepends = ncurses: adds the smap command
optdepends = gtk2: enables the sview command, a simple graphical frontend
- provides = slurm-llnl=27818.af1afa3
+ provides = slurm-llnl=16.05.0.0rc2.r73.g9de1598
conflicts = slurm-llnl
conflicts = slurm-llnl-dev
backup = etc/default/slurm-llnl
diff --git a/PKGBUILD b/PKGBUILD
index cbc79bb6cf72..7a7f8c33cd85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Submitter: Fredrik Tegenfeldt <fredrik.tegenfeldt@unige.ch>
pkgname=slurm-llnl-git
-pkgver=27818.af1afa3
+pkgver=16.05.0.0rc2.r73.g9de1598
pkgrel=1
pkgdesc="Simple Linux Utility for Resource Management (development version)"
arch=('i686' 'x86_64')
@@ -45,7 +45,10 @@ md5sums=('51e4ae2c51edf7c145d1b87bec4c344e'
pkgver() {
cd "${srcdir}/${pkgname}"
- echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+ ( set -o pipefail
+ git describe --long 2>/dev/null | sed 's/^slurm-//;s/\([^-]*-g\)/r\1/;s/-/./g' \
+ || printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ )
}
build() {