[packages/glog] - switched tests to system gmock-devel (as packaged since 1.10.0)

qboosh qboosh at pld-linux.org
Fri May 22 21:24:57 CEST 2020


commit 7a7b4539ef0c2acf52f52496375c1b15869800c2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri May 22 21:25:33 2020 +0200

    - 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}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glog.git/commitdiff/7a7b4539ef0c2acf52f52496375c1b15869800c2



More information about the pld-cvs-commit mailing list