From aa9259d2d2c9110631b4d19d512a2504bdfdefad Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Sun, 17 Mar 2019 17:19:22 +0100 Subject: Update spec file for Fedora 30. --- dist/vespa.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dist/vespa.spec b/dist/vespa.spec index ca53c5969d8..089fc3e2670 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -57,8 +57,14 @@ BuildRequires: gtest-devel BuildRequires: gmock-devel %endif %if 0%{?fc30} -BuildRequires: llvm-devel >= 7.0.0 -BuildRequires: boost-devel >= 1.66 +BuildRequires: llvm-devel >= 8.0.0 +BuildRequires: boost-devel >= 1.69 +BuildRequires: gtest-devel +BuildRequires: gmock-devel +%endif +%if 0%{?fc31} +BuildRequires: llvm-devel >= 8.0.0 +BuildRequires: boost-devel >= 1.69 BuildRequires: gtest-devel BuildRequires: gmock-devel %endif @@ -129,8 +135,12 @@ Requires: llvm-libs >= 7.0.0 %define _vespa_llvm_version 7 %endif %if 0%{?fc30} -Requires: llvm-libs >= 7.0.0 -%define _vespa_llvm_version 7 +Requires: llvm-libs >= 8.0.0 +%define _vespa_llvm_version 8 +%endif +%if 0%{?fc31} +Requires: llvm-libs >= 8.0.0 +%define _vespa_llvm_version 8 %endif %define _extra_link_directory /opt/vespa-cppunit/lib%{?_vespa_llvm_link_directory:;%{_vespa_llvm_link_directory}}%{?_vespa_gtest_link_directory:;%{_vespa_gtest_link_directory}} %define _extra_include_directory /opt/vespa-cppunit/include%{?_vespa_llvm_include_directory:;%{_vespa_llvm_include_directory}}%{?_vespa_gtest_include_directory:;%{_vespa_gtest_include_directory}} -- cgit v1.2.3