From b28e660da558827e2b458c38d3f3340cf79e2bfb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 23 Feb 2015 11:50:11 +0100 Subject: [PATCH] gmock-devel: conflicts with gtest-devel. --- srcpkgs/gmock/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gmock/template b/srcpkgs/gmock/template index fa482e76f92..ddcd3ca25fc 100644 --- a/srcpkgs/gmock/template +++ b/srcpkgs/gmock/template @@ -1,7 +1,7 @@ # Template build file for 'gmock' pkgname=gmock version=1.7.0 -revision=3 +revision=4 build_style=gnu-configure short_desc="Google C++ Mocking Framework" maintainer="Enno Boland " @@ -13,6 +13,7 @@ checksum=26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b configure_args="--enable-external-gtest" gmock-devel_package() { + conflicts="gtest-devel>=0" depends="gmock>=${version}_${revision}" short_desc+=" - development files" pkg_install() {