Added gtest to conflicts

2 files changed, 2 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a5930d39af14..b0a8799750b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,6 +20,7 @@ pkgbase = trilinos
 	depends = openmpi
 	depends = python2
 	depends = boost
+	conflicts = gtest
 	source = http://trilinos.org/oldsite/download/files/trilinos-12.2.1-Source.tar.bz2
 	md5sums = 760f14cbce482b4b9a41d1c18297b531
 
diff --git a/PKGBUILD b/PKGBUILD
index eaa976d13061..4f07e8b3d087 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,6 +8,7 @@ arch=('i686' 'x86_64')
 url="http://trilinos.org"
 license=('LGPL3')
 depends=('lapack' 'openmpi' 'python2' 'boost')
+conflicts=('gtest')
 source=(http://trilinos.org/oldsite/download/files/${pkgname}-${pkgver}-Source.tar.bz2)
 makedepends=('python2' 'python2-numpy' 'swig' 'gcc' 'gcc-fortran' 'openmpi' 'perl' 'blas' 'lapack' 'cmake')
 # gcc-fortran gcc-fortran-multilib