diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2020-07-14 10:27:31 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-07-14 10:50:55 +0200 |
commit | eeb1c6b4e85a1c0af91f99afd73e618c5fa002b4 (patch) | |
tree | ab634eff23f56ac9faf7385740ab228f58d859e1 /dist | |
parent | 35f911d07b35ccf6ab839cd664167ee0518da73e (diff) |
Require new versions of vespa-lz4 and vespa-zstd.
Don't require normal libzstd.
Diffstat (limited to 'dist')
-rw-r--r-- | dist/vespa.spec | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 63912a6ed16..0779ba43fd9 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -57,11 +57,11 @@ BuildRequires: llvm7.0-devel BuildRequires: vespa-boost-devel >= 1.59.0-6 BuildRequires: vespa-gtest >= 1.8.1-1 BuildRequires: vespa-icu-devel >= 65.1.0-1 -BuildRequires: vespa-lz4-devel >= 1.9.2-1 +BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel >= 1.3.0-1 BuildRequires: vespa-openssl-devel >= 1.1.1g-1 BuildRequires: vespa-protobuf-devel >= 3.7.0-4 -BuildRequires: vespa-libzstd-devel >= 1.4.5-1 +BuildRequires: vespa-libzstd-devel >= 1.4.5-2 %endif %if 0%{?el8} BuildRequires: cmake >= 3.11.4-3 @@ -69,18 +69,18 @@ BuildRequires: llvm-devel >= 9.0.1 BuildRequires: boost-devel >= 1.66 BuildRequires: openssl-devel BuildRequires: vespa-gtest >= 1.8.1-1 -BuildRequires: vespa-lz4-devel >= 1.9.2-1 +BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel >= 1.3.0-1 BuildRequires: vespa-protobuf-devel >= 3.7.0-4 -BuildRequires: vespa-libzstd-devel >= 1.4.5-1 +BuildRequires: vespa-libzstd-devel >= 1.4.5-2 %endif %if 0%{?fedora} BuildRequires: cmake >= 3.9.1 BuildRequires: maven BuildRequires: openssl-devel -BuildRequires: vespa-lz4-devel >= 1.9.2-1 +BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel >= 1.3.0-1 -BuildRequires: vespa-libzstd-devel >= 1.4.5-1 +BuildRequires: vespa-libzstd-devel >= 1.4.5-2 %if 0%{?fc31} BuildRequires: vespa-protobuf-devel >= 3.7.0-4 BuildRequires: llvm-devel >= 9.0.0 @@ -105,7 +105,6 @@ BuildRequires: gmock-devel %endif BuildRequires: xxhash-devel >= 0.7.3 BuildRequires: openblas-devel -BuildRequires: libzstd BuildRequires: zlib-devel BuildRequires: re2-devel %if ! 0%{?el7} @@ -162,13 +161,13 @@ Requires: net-tools %if 0%{?el7} Requires: llvm7.0 Requires: vespa-icu >= 65.1.0-1 -Requires: vespa-lz4 >= 1.9.2-1 +Requires: vespa-lz4 >= 1.9.2-2 Requires: vespa-onnxruntime >= 1.3.0-1 Requires: vespa-openssl >= 1.1.1g-1 Requires: vespa-protobuf >= 3.7.0-4 Requires: vespa-telegraf >= 1.1.1-1 Requires: vespa-valgrind >= 3.16.0-1 -Requires: vespa-zstd >= 1.4.5-1 +Requires: vespa-zstd >= 1.4.5-2 %define _vespa_llvm_version 7 %define _extra_link_directory /usr/lib64/llvm7.0/lib;%{_vespa_deps_prefix}/lib64 %define _extra_include_directory /usr/include/llvm7.0;%{_vespa_deps_prefix}/include;/usr/include/openblas @@ -177,18 +176,18 @@ Requires: vespa-zstd >= 1.4.5-1 Requires: llvm-libs >= 9.0.1 %define _vespa_llvm_version 9 Requires: openssl-libs -Requires: vespa-lz4 >= 1.9.2-1 +Requires: vespa-lz4 >= 1.9.2-2 Requires: vespa-onnxruntime >= 1.3.0-1 Requires: vespa-protobuf >= 3.7.0-4 -Requires: vespa-zstd >= 1.4.5-1 +Requires: vespa-zstd >= 1.4.5-2 %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include;/usr/include/openblas %endif %if 0%{?fedora} Requires: openssl-libs -Requires: vespa-lz4 >= 1.9.2-1 +Requires: vespa-lz4 >= 1.9.2-2 Requires: vespa-onnxruntime >= 1.3.0-1 -Requires: vespa-zstd >= 1.4.5-1 +Requires: vespa-zstd >= 1.4.5-2 %if 0%{?fc31} Requires: vespa-protobuf >= 3.7.0-4 Requires: llvm-libs >= 9.0.0 @@ -242,14 +241,13 @@ Vespa - The open big data serving engine - base Summary: Vespa - The open big data serving engine - base C++ libs Requires: xxhash-libs >= 0.7.3 -Requires: libzstd %if 0%{?el7} Requires: vespa-openssl >= 1.1.1g-1 %else Requires: openssl-libs %endif -Requires: vespa-lz4 >= 1.9.2-1 -Requires: vespa-zstd >= 1.4.5-1 +Requires: vespa-lz4 >= 1.9.2-2 +Requires: vespa-zstd >= 1.4.5-2 %description base-libs |