summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-04-29 12:31:33 +0200
committerGitHub <noreply@github.com>2021-04-29 12:31:33 +0200
commitcde4308c6dbcb029573b15a95aac8bc31e2a931f (patch)
treef74b95c9569898afe231cb41b9eb2e495029636c /dist
parent1361965fc18c9818da8d81fcc95a642fb51df85e (diff)
Revert "Use exact Protobuf version as dependency"
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec16
1 files changed, 4 insertions, 12 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 65b5bcfe220..ab69acb7315 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -69,11 +69,7 @@ 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
-%if 0%{?centos}
-BuildRequires: vespa-protobuf-devel = 3.7.0-4
-%else
-BuildRequires: vespa-protobuf-devel = 3.7.0-5
-%endif
+BuildRequires: vespa-protobuf-devel >= 3.7.0-4
BuildRequires: vespa-libzstd-devel >= 1.4.5-2
%endif
%if 0%{?el8}
@@ -88,7 +84,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-5
+BuildRequires: vespa-protobuf-devel >= 3.7.0-4
BuildRequires: vespa-libzstd-devel >= 1.4.5-2
%endif
%if 0%{?fedora}
@@ -191,11 +187,7 @@ 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
-%if 0%{?centos}
-Requires: vespa-protobuf = 3.7.0-4
-%else
-Requires: vespa-protobuf = 3.7.0-5
-%endif
+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-2
@@ -214,7 +206,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-5
+Requires: vespa-protobuf >= 3.7.0-4
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