aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@verizonmedia.com>2019-02-18 15:27:15 +0100
committerTor Egge <Tor.Egge@verizonmedia.com>2019-02-18 15:31:01 +0100
commit91ce0568bea8db71e167b3de8b5e9f7416f5126b (patch)
tree56569d0b12725508cadb05d74bff87f7efd3527c /dist
parent5a02c735a598ec0b4a93e5b99cb618a23425d5f9 (diff)
Use vespa-gtest 1.8.1.
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec8
1 files changed, 4 insertions, 4 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 0a9e8a284ce..ca53c5969d8 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -34,7 +34,7 @@ BuildRequires: Judy-devel
BuildRequires: cmake3
BuildRequires: llvm5.0-devel
BuildRequires: vespa-boost-devel >= 1.59.0-6
-BuildRequires: vespa-gtest >= 1.8.0-1
+BuildRequires: vespa-gtest >= 1.8.1-1
%endif
%if 0%{?fedora}
BuildRequires: cmake >= 3.9.1
@@ -42,7 +42,7 @@ BuildRequires: maven
%if 0%{?fc27}
BuildRequires: llvm-devel >= 5.0.2
BuildRequires: boost-devel >= 1.64
-BuildRequires: vespa-gtest >= 1.8.0-2
+BuildRequires: vespa-gtest >= 1.8.1-1
%endif
%if 0%{?fc28}
BuildRequires: llvm-devel >= 6.0.1
@@ -110,14 +110,14 @@ Requires: net-tools
%if 0%{?centos}
Requires: llvm5.0
%define _vespa_llvm_version 5.0
-%define _extra_link_directory /usr/lib64/llvm5.0/lib;/opt/vespa-gtest/lib;/opt/vespa-cppunit/lib
+%define _extra_link_directory /usr/lib64/llvm5.0/lib;/opt/vespa-gtest/lib64;/opt/vespa-cppunit/lib
%define _extra_include_directory /usr/include/llvm5.0;/opt/vespa-boost/include;/opt/vespa-gtest/include;/opt/vespa-cppunit/include
%endif
%if 0%{?fedora}
%if 0%{?fc27}
Requires: llvm-libs >= 5.0.2
%define _vespa_llvm_version 5.0
-%define _vespa_gtest_link_directory /opt/vespa-gtest/lib
+%define _vespa_gtest_link_directory /opt/vespa-gtest/lib64
%define _vespa_gtest_include_directory /opt/vespa-gtest/include
%endif
%if 0%{?fc28}