From 7a7b4539ef0c2acf52f52496375c1b15869800c2 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 22 May 2020 21:25:33 +0200 Subject: [PATCH] - switched tests to system gmock-devel (as packaged since 1.10.0) --- glog.spec | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/glog.spec b/glog.spec index 6a46ef7..c8fed78 100644 --- a/glog.spec +++ b/glog.spec @@ -22,7 +22,7 @@ BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:1.5 BuildRequires: pkgconfig %if %{with tests} -BuildRequires: gmock-devel +BuildRequires: gmock-devel >= 1.10.0 BuildRequires: gtest-devel %else BuildConflicts: gmock-devel @@ -77,15 +77,6 @@ Statyczna biblioteka glog. %patch1 -p1 %build -%if %{with tests} -install -d gmock -cd gmock -%cmake $(pkg-config --variable=srcdir gmock) \ - -DBUILD_SHARED_LIBS=OFF -%{__make} -cd .. -LDFLAGS="%{rpmldflags} -L$(pwd)/gmock" -%endif %{__libtoolize} %{__aclocal} -I m4 %{__autoconf} -- 2.44.0