summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKilian Köppchen2016-04-21 22:03:02 +0200
committerKilian Köppchen2016-04-21 22:03:02 +0200
commitdb62118b421bd7e3334afb8134a70fbf8de5a254 (patch)
treef7919680d6fdd3fe1a55f8938947f81079dec6da
parent161fb14cbd41c75997682d04737adc93ef54e246 (diff)
downloadaur-unittest-cpp-git.tar.gz
Add conflict
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2725e35e5e25..6d6fa8d71167 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = unittest-cpp-git
makedepends = cmake
makedepends = make
depends = gcc-libs
+ conflicts = unittestpp
source = unittest-cpp-git::git+https://github.com/unittest-cpp/unittest-cpp.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 50b586f26eae..1189e50463ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,6 +10,7 @@ depends=('gcc-libs')
makedepends=('git' 'cmake' 'make')
source=("$pkgname"::'git+https://github.com/unittest-cpp/unittest-cpp.git')
md5sums=('SKIP')
+conflicts=('unittestpp')
pkgver() {
cd "$srcdir/$pkgname"