Add conflict with clang-trunk

2 files changed, 2 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e68faeca4daf..9d9f86f17392 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,6 +16,7 @@ pkgbase = templight-git
 	optdepends = templight-tools: Additional facilities to process the profiling data.
 	provides = templight
 	conflicts = templight
+	conflicts = clang-trunk
 	source = llvm::svn+http://llvm.org/svn/llvm-project/llvm/trunk
 	source = cfe::svn+http://llvm.org/svn/llvm-project/cfe/trunk
 	source = git://github.com/mikael-s-persson/templight.git
diff --git a/PKGBUILD b/PKGBUILD
index 8ad59778b183..394ee7d85b53 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ depends=('llvm-libs' 'gcc' 'clang' 'compiler-rt')
 optdepends=('templight-tools: Additional facilities to process the profiling data.')
 makedepends=('git' 'subversion' 'llvm' 'cmake')
 provides=("templight")
-conflicts=("templight")
+conflicts=("templight" "clang-trunk")
 source=(llvm::svn+http://llvm.org/svn/llvm-project/llvm/trunk
         cfe::svn+http://llvm.org/svn/llvm-project/cfe/trunk
         git://github.com/mikael-s-persson/templight.git