summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeverin Glöckner2018-12-02 02:51:53 +0100
committerSeverin Glöckner2018-12-02 02:51:53 +0100
commit17691217b87b3f5de53db1afa758c6d5039d4f63 (patch)
treed935ce64bae99e2a1c6432647613c4eb76092c67
parentfc94bc7bbbd0ce0d6c370963750b88adf3a69c66 (diff)
downloadaur-17691217b87b3f5de53db1afa758c6d5039d4f63.tar.gz
use tags for version number generation
but stick still to the same format as the old zipios++ version
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD15
2 files changed, 12 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 46e98df7176..1eea93d8d8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zipios-git
pkgdesc = Small C++ library for reading and writing zip files, similar to java.util.zip and the standard iostreams library
- pkgver = 2.1.7+cvs.2018.12.01
+ pkgver = 2.1.7.11
pkgrel = 1
url = http://zipios.sourceforge.net
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 5e97ee766c7..ec473d52091 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,7 @@
# zipios++ has been rebranded to zipios
pkgname=zipios-git
-pkgver=2.1.7+cvs.2018.12.01
-_pkgver=2.1.7
+pkgver=2.1.7.11
pkgrel=1
pkgdesc="Small C++ library for reading and writing zip files, similar to java.util.zip and the standard iostreams library"
arch=('i686' 'x86_64')
@@ -17,8 +16,16 @@ source=("git+https://github.com/Zipios/Zipios.git")
md5sums=('SKIP')
pkgver() {
- _last_commit_date=$( git log -1 --date=short --pretty=format:%cd | sed s/-/./g )
- echo $_pkgver+cvs.$_last_commit_date
+ cd Zipios
+
+ _pkgver=$( git describe --abbrev=0 | sed s/^v// )
+
+ if [ $_pkgver = $(git describe | sed s/^v// ) ]; then
+ echo $_pkgver
+ else
+ _last_commit_date=$( git log -1 --date=short --pretty=format:%cd | sed s/-/./g )
+ echo $_pkgver+cvs.$_last_commit_date
+ fi
}
build() {