summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD15
2 files changed, 13 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d4de9ce58f5b..fe96a909ab5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu Apr 6 19:33:46 UTC 2017
+# Wed Apr 12 21:36:13 UTC 2017
pkgbase = alpine-git
pkgdesc = Fork of the PINE mail client (git)
pkgver = 2.21.1.209.a9d7a00
diff --git a/PKGBUILD b/PKGBUILD
index 01db07f9c448..e5febda9630e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,9 +22,18 @@ source=("git+http://repo.or.cz/${gitname}.git")
sha512sums=('SKIP')
pkgver() {
- cd "${srcdir}/${gitname}"
- local ver="$(cat VERSION).$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
- printf "%s" "${ver//-/.}"
+ cd "${srcdir}/${gitname}"
+
+ # we recently went
+ # from 2.21.204.5117359
+ # to 2.21.1.209.a9d7a00
+ # which rightfully confused pacman's version ordering
+ # so let's add a .0 to versions with only one dot
+ local v=$(cat VERSION)
+ [[ "$v" =~ ^[^\.]+\.[^\.]+\..*$ ]] || v=$v.0
+
+ local ver="${v}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+ printf "%s" "${ver//-/.}"
}
build() {
cd "${srcdir}/${gitname}"