add conflicts and replaces

2 files changed, 10 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 948bd96684f7..bba578728c3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wacom-utility-git
 	pkgdesc = Graphical tablet configuration utility
 	pkgver = 20150614
-	pkgrel = 1
+	pkgrel = 2
 	url = http://github.com/lubosz/wacom-utility.git
 	arch = i686
 	arch = x86_64
@@ -10,6 +10,8 @@ pkgbase = wacom-utility-git
 	depends = python2
 	depends = xf86-input-wacom
 	depends = gksu
+	conflicts = wacom-utility
+	replaces = wacom-utility
 	source = wacom-utility.desktop
 	md5sums = 1d44b3571fd5e48b80b2dec5209fcf47
 
diff --git a/PKGBUILD b/PKGBUILD
index 98b6941c0c03..42b8af10aaff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,17 @@
 pkgname=wacom-utility-git
 pkgver=20150614
-pkgrel=1
+pkgver() {
+    cd "${pkgname}"
+    git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+}
+pkgrel=2
 pkgdesc="Graphical tablet configuration utility"
 arch=('i686' 'x86_64')
 url="http://github.com/lubosz/wacom-utility.git"
 license=('GPL')
 depends=('gtk2' 'python2' 'xf86-input-wacom' 'gksu')
+conflicts=('wacom-utility')
+replaces=('wacom-utility')
 source=(wacom-utility.desktop)
 md5sums=('1d44b3571fd5e48b80b2dec5209fcf47')