summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeverin Glöckner2019-05-12 03:37:39 +0200
committerSeverin Glöckner2019-05-12 03:37:39 +0200
commit96c2285dd040f21045b740cef9c8ee66e364a352 (patch)
tree399adaba296a4862d6efe9dbf73e118833594459
parent17691217b87b3f5de53db1afa758c6d5039d4f63 (diff)
downloadaur-96c2285dd040f21045b740cef9c8ee66e364a352.tar.gz
better tag detection
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD8
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1eea93d8d8e..e3db8a416b9 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.11
+ pkgver = 2.1.7.11+cvs.2019.04.25
pkgrel = 1
url = http://zipios.sourceforge.net
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index ec473d52091..a26702d3f03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# zipios++ has been rebranded to zipios
pkgname=zipios-git
-pkgver=2.1.7.11
+pkgver=2.2.1.0
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')
@@ -18,11 +18,13 @@ md5sums=('SKIP')
pkgver() {
cd Zipios
- _pkgver=$( git describe --abbrev=0 | sed s/^v// )
+ _pkgver=$( git describe --tags --abbrev=0 | sed s/^v// )
- if [ $_pkgver = $(git describe | sed s/^v// ) ]; then
+ if [ $_pkgver = $(git describe --tags | sed s/^v// ) ]; then
+ # version is tagged
echo $_pkgver
else
+ # otherwise tag + date of last commit, in the same style like old zipios++
_last_commit_date=$( git log -1 --date=short --pretty=format:%cd | sed s/-/./g )
echo $_pkgver+cvs.$_last_commit_date
fi