summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorprash2019-05-08 04:43:09 +0530
committerprash2019-05-08 04:43:09 +0530
commitdea489c347892cac5ef5a3a402829833e496df42 (patch)
tree73e5cd772d676224355dd3fd2193835f54e95c13
parentcec0ce583199f9caedf284ac2b8dff2139ad1e43 (diff)
downloadaur-dea489c347892cac5ef5a3a402829833e496df42.tar.gz
Use the version tag indicated in CMakeLists.txt
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bfe0b684d4b6..cfedce45c103 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = kdiff3-git
pkgdesc = A KDE file comparator/merge tool
- pkgver = 1.7.90_3029480
+ pkgver = 1.9.70_f406df5
pkgrel = 1
url = https://cgit.kde.org/kdiff3.git
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 80e450e3b75d..9e29f21652e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
_basename=kdiff3
pkgname=${_basename}-git
-pkgver=1.7.90_3029480
+pkgver=1.9.70_f406df5
pkgrel=1
pkgdesc="A KDE file comparator/merge tool"
arch=('i686' 'x86_64')
@@ -14,7 +14,8 @@ sha512sums=('SKIP')
pkgver() {
cd "$srcdir/$_basename"
- git describe --always | sed "s/-/./g" | sed "s/^/1.7.90_/g"
+ ver=`grep -Po 'ecm_setup_version\(\K([0-9.]+)' CMakeLists.txt`
+ git describe --always | sed "s/-/./g" | sed "s/^/${ver}_/g"
}
prepare() {