diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-09-02 11:47:26 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-09-02 11:47:26 +0200 |
commit | 3e496c4abdf9469080b5e0e55912b3b0687c54ef (patch) | |
tree | 46d7602eb13d778f002c3ebe228f1dbd14f5a3cf /dist | |
parent | 01c7428f3e19d87064a59401c6c574572f64695c (diff) |
Add Fedora 32 (rawhide) to spec file.
Adjust openssl dependencies.
Diffstat (limited to 'dist')
-rw-r--r-- | dist/vespa.spec | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 285c54287dc..2d6e8cbfd13 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -43,6 +43,7 @@ BuildRequires: vespa-openssl-devel >= 1.1.1c-1 BuildRequires: cmake >= 3.9.1 BuildRequires: maven BuildRequires: vespa-protobuf-devel >= 3.7.0-4 +BuildRequires: openssl-devel %if 0%{?fc29} BuildRequires: llvm-devel >= 7.0.0 BuildRequires: boost-devel >= 1.66 @@ -61,6 +62,12 @@ BuildRequires: boost-devel >= 1.69 BuildRequires: gtest-devel BuildRequires: gmock-devel %endif +%if 0%{?fc32} +BuildRequires: llvm-devel >= 8.0.0 +BuildRequires: boost-devel >= 1.69 +BuildRequires: gtest-devel +BuildRequires: gmock-devel +%endif %endif BuildRequires: xxhash-devel >= 0.6.5 BuildRequires: lz4-devel @@ -68,7 +75,6 @@ BuildRequires: libzstd-devel BuildRequires: zlib-devel BuildRequires: libicu-devel BuildRequires: java-11-openjdk-devel -BuildRequires: openssl-devel BuildRequires: rpm-build BuildRequires: make BuildRequires: git @@ -117,6 +123,7 @@ Requires: vespa-protobuf >= 3.7.0-4 %endif %if 0%{?fedora} Requires: vespa-protobuf >= 3.7.0-4 +Requires: openssl-libs %if 0%{?fc29} Requires: llvm-libs >= 7.0.0 %define _vespa_llvm_version 7 @@ -129,6 +136,10 @@ Requires: llvm-libs >= 8.0.0 Requires: llvm-libs >= 8.0.0 %define _vespa_llvm_version 8 %endif +%if 0%{?fc32} +Requires: llvm-libs >= 8.0.0 +%define _vespa_llvm_version 8 +%endif %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include %endif |