summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
2 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 229a63fb01c..410b9d3d119 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by makepkg 4.2.0
-# Sun Jan 18 18:17:45 UTC 2015
pkgbase = qconnman-git
pkgdesc = QConnman Library (Qt)
- pkgver = r202.g6b9d09b
+ pkgver = 1.24
pkgrel = 1
epoch = 4
url = https://bitbucket.org/OSSystems/qconnman
@@ -12,6 +10,8 @@ pkgbase = qconnman-git
makedepends = git
depends = connman
depends = qt4
+ provides = qconnman=1.24
+ conflicts = qconnman
source = git+https://bitbucket.org/devonit/qconnman.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6da909c0362..1f102baf5c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Rob McCathie <archaur at rmcc dot com dot au>
pkgname=qconnman-git
-pkgver=r202.g6b9d09b
+pkgver=1.24
pkgrel=1
epoch=4
pkgdesc="QConnman Library (Qt)"
@@ -11,14 +11,14 @@ url="https://bitbucket.org/OSSystems/qconnman"
license=('LGPL')
depends=('connman' 'qt4')
makedepends=('git')
+conflicts=("qconnman")
+provides=("qconnman=$pkgver")
source=(git+https://bitbucket.org/devonit/qconnman.git)
md5sums=('SKIP')
pkgver() {
cd "$srcdir"/qconnman
- local r=$(git rev-list --count HEAD)
- local h=$(git rev-parse --short HEAD)
- echo "r$r.g$h"
+ git describe | sed 's/^v//; s/-/.r/; s/-/./'
}
build() {