gmock: no longer conflicts with gtest
This was resolved in 3da84d425bbdedd86bffb2b54cc877423a5731a3
This commit is contained in:
parent
ac9ecb92b7
commit
c23f4ce7a5
@ -1,7 +1,7 @@
|
|||||||
# Template build file for 'gmock'
|
# Template build file for 'gmock'
|
||||||
pkgname=gmock
|
pkgname=gmock
|
||||||
version=1.7.0
|
version=1.7.0
|
||||||
revision=6
|
revision=7
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
short_desc="Google C++ Mocking Framework"
|
short_desc="Google C++ Mocking Framework"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
||||||
@ -22,7 +22,6 @@ post_install() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
gmock-devel_package() {
|
gmock-devel_package() {
|
||||||
conflicts="gtest-devel>=0"
|
|
||||||
depends="gmock>=${version}_${revision} gtest-devel"
|
depends="gmock>=${version}_${revision} gtest-devel"
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user