summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey D2016-05-27 15:17:14 +0300
committerAlexey D2016-05-27 15:17:14 +0300
commitc2b4c3b8c05aa3fdcfd8974f985b25ea8020aeb4 (patch)
treec1895875a9a19499722a4343b442b5a4abe78f37
parentd90f0447f71b881bbf63737c0af87be683c276e6 (diff)
downloadaur-c2b4c3b8c05aa3fdcfd8974f985b25ea8020aeb4.tar.gz
new version scheme
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
2 files changed, 9 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eb910fb5b1a8..d9df69be09d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri May 27 06:21:49 UTC 2016
+# Fri May 27 12:16:54 UTC 2016
pkgbase = psi-plus-git
pkgdesc = Psi+ is a powerful Jabber client (Qt, C++) designed for the Jabber power users
- pkgver = 0.16.559
+ pkgver = 0.16.559.574
pkgrel = 1
url = http://psi-plus.com
install = psi-plus-git.install
@@ -18,7 +18,7 @@ pkgbase = psi-plus-git
depends = aspell
depends = libxss
optdepends = qca-gnupg: encrypted client-to-client connection
- provides = psi-plus=0.16.559
+ provides = psi-plus=0.16.559.574
conflicts = psi-plus
conflicts = psi-plus-webkit-git
replaces = psi-plus
diff --git a/PKGBUILD b/PKGBUILD
index 82b592a7f660..3753427a8c40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Joker-jar <joker-jar@yandex.ru>
pkgname="psi-plus-git"
-pkgver=0.16.559
+pkgver=0.16.559.574
pkgrel=1
pkgdesc="Psi+ is a powerful Jabber client (Qt, C++) designed for the Jabber power users"
url="http://psi-plus.com"
@@ -27,7 +27,11 @@ md5sums=('SKIP'
pkgver() {
cd "$srcdir"/psi-plus
- git describe --tags | cut -d - -f 1-2 --output-delimiter=.
+ PSI_PLUS_REVISION="$(git describe --tags | cut -d - -f 2)"
+ PSI_PLUS_TAG="$(git describe --tags | cut -d - -f 1)"
+ PSI_REVISION="$(cd "$srcdir"/psi && git describe --tags | cut -d - -f 2)"
+
+ echo "${PSI_PLUS_TAG}.${PSI_PLUS_REVISION}.${PSI_REVISION}"
}
prepare() {