diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2021-04-30 14:10:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 14:10:13 +0200 |
| commit | bf545cdb9bcaa3301707576b07e6ed10379a71fd (patch) | |
| tree | b116ee1945542eda77379f1c26da10c107cbd2f6 | |
| parent | cf0d0a6d071f19d830633267796fca09f67ba89d (diff) | |
| parent | 245bbae774ea27418d07c23fb23cbdf10ea00cbd (diff) | |
Merge pull request #17669 from vespa-engine/revert-17663-revert-17659-revert-17655-revert-17636-vekterli/use-exact-protobuf-dependency-version
Reapply "Use exact Protobuf version as dependency"
| -rw-r--r-- | dist/vespa.spec | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index ab69acb7315..0d3545bd16c 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -69,7 +69,11 @@ BuildRequires: vespa-icu-devel >= 65.1.0-1 BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel = 1.7.1 BuildRequires: vespa-openssl-devel >= 1.1.1k-1 -BuildRequires: vespa-protobuf-devel >= 3.7.0-4 +%if 0%{?centos} +BuildRequires: vespa-protobuf-devel = 3.7.0-4.el7 +%else +BuildRequires: vespa-protobuf-devel = 3.7.0-5.el7 +%endif BuildRequires: vespa-libzstd-devel >= 1.4.5-2 %endif %if 0%{?el8} @@ -84,7 +88,7 @@ BuildRequires: openssl-devel BuildRequires: vespa-gtest >= 1.8.1-1 BuildRequires: vespa-lz4-devel >= 1.9.2-2 BuildRequires: vespa-onnxruntime-devel = 1.7.1 -BuildRequires: vespa-protobuf-devel >= 3.7.0-4 +BuildRequires: vespa-protobuf-devel = 3.7.0-5.el8 BuildRequires: vespa-libzstd-devel >= 1.4.5-2 %endif %if 0%{?fedora} @@ -187,7 +191,11 @@ Requires: vespa-icu >= 65.1.0-1 Requires: vespa-lz4 >= 1.9.2-2 Requires: vespa-onnxruntime = 1.7.1 Requires: vespa-openssl >= 1.1.1k-1 -Requires: vespa-protobuf >= 3.7.0-4 +%if 0%{?centos} +Requires: vespa-protobuf = 3.7.0-4.el7 +%else +Requires: vespa-protobuf = 3.7.0-5.el7 +%endif Requires: vespa-telegraf >= 1.1.1-1 Requires: vespa-valgrind >= 3.16.0-1 Requires: vespa-zstd >= 1.4.5-2 @@ -206,7 +214,7 @@ Requires: llvm-libs >= 10.0.1 Requires: openssl-libs Requires: vespa-lz4 >= 1.9.2-2 Requires: vespa-onnxruntime = 1.7.1 -Requires: vespa-protobuf >= 3.7.0-4 +Requires: vespa-protobuf = 3.7.0-5.el8 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 |