Add conflicts with gtsam-git

2 files changed, 2 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3d9bed18590..4ba4c5f41428 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,6 +14,7 @@ pkgbase = gtsam-mkl
 	depends = intel-mkl
 	provides = gtsam=4.0.2
 	conflicts = gtsam
+	conflicts = gtsam-git
 	source = https://github.com/borglab/gtsam-mkl/archive/4.0.2.tar.gz
 	source = rename-included-libmetis.patch
 	source = skip-boost-debug-libs.patch
diff --git a/PKGBUILD b/PKGBUILD
index 2a0687f457b2..8ab171326a97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="A library of C++ classes that implement smoothing and mapping (SAM) in\
 url="https://gtsam.org/"
 arch=('x86_64' 'i686')
 provides=("gtsam=${pkgver}")
-conflicts=('gtsam')
+conflicts=('gtsam' 'gtsam-git')
 license=('BSD')
 depends=('boost-libs' 'eigen' 'intel-tbb' 'intel-mkl')
 makedepends=('boost' 'cmake')