Add conflict with pps-tools-git

2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd12765ef67c..bc090a3ad958 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 # Generated by mksrcinfo v8
-# Thu Mar 23 07:24:57 UTC 2017
+# Sat Mar 25 00:14:25 UTC 2017
 pkgbase = pps-tools
 	pkgdesc = LinuxPPS user-space tools
 	pkgver = 1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://linuxpps.org/
 	arch = aarch64
 	arch = arm7vh
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	conflicts = pps-tools-git
 	source = https://github.com/ago/pps-tools/archive/v1.0.tar.gz
 	sha512sums = fd63f3121bbd850bf0b8d84b57e0c14f4ce26fe710c749cc4237684a1bb46fdfa49beeddb26cb98bd81f24cc1d6f8969dc54c6ed339ca2eed43d5a0884b19276
 
diff --git a/PKGBUILD b/PKGBUILD
index 48d436e6430a..325bf1e719a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,11 @@
 pkgname=pps-tools
 pkgdesc="LinuxPPS user-space tools"
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 arch=('aarch64' 'arm7vh' 'i686' 'x86_64')
 url="http://linuxpps.org/"
 license=('GPL2')
+conflicts=('pps-tools-git')
 source=("https://github.com/ago/pps-tools/archive/v$pkgver.tar.gz")
 sha512sums=('fd63f3121bbd850bf0b8d84b57e0c14f4ce26fe710c749cc4237684a1bb46fdfa49beeddb26cb98bd81f24cc1d6f8969dc54c6ed339ca2eed43d5a0884b19276')