aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2021-04-29 14:43:11 +0200
committerGitHub <noreply@github.com>2021-04-29 14:43:11 +0200
commitc5cf239d2d5c3b9fe246fbcddf0ee148bbcbecc4 (patch)
treee4e7a8c4bc5a3d15a03ad9836fa68060958c86f5 /dist
parent6630a8a467635d04257f8ac2a54ad0c4f5c1cb7d (diff)
Revert "Revert "Use exact Protobuf version as dependency""
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec16
1 files changed, 12 insertions, 4 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index ab69acb7315..65b5bcfe220 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
+%else
+BuildRequires: vespa-protobuf-devel = 3.7.0-5
+%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
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
+%else
+Requires: vespa-protobuf = 3.7.0-5
+%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
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