diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-02-03 16:28:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 16:28:03 +0100 |
| commit | 6ad62b3385c54a367616ea7a07ba2165ce8961ff (patch) | |
| tree | 8d9b76cb5e95ff1437d35aed63a01c90ea569c7f | |
| parent | 4c6b9c1a1c5ab499a48c2ae1b6e6e0f6b12c7c10 (diff) | |
| parent | 02906bc076ea25a2d5d24f83eb07cc12e8f106e4 (diff) | |
Merge pull request #12052 from vespa-engine/toregge/use-vespa-icu-for-centos-7-and-rhel-7
Use vespa-icu for CentOS 7 and RHEL 7.
| -rw-r--r-- | dist/vespa.spec | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index f82559e9637..3a336496f4c 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -47,6 +47,7 @@ BuildRequires: vespa-boost-devel >= 1.59.0-6 BuildRequires: vespa-gtest >= 1.8.1-1 BuildRequires: vespa-protobuf-devel >= 3.7.0-4 BuildRequires: vespa-openssl-devel >= 1.1.1c-1 +BuildRequires: vespa-icu-devel >= 65.1.0-1 %endif %if 0%{?el8} BuildRequires: cmake >= 3.11.4-3 @@ -91,7 +92,9 @@ BuildRequires: openblas-devel BuildRequires: lz4-devel BuildRequires: libzstd-devel BuildRequires: zlib-devel +%if ! 0%{?el7} BuildRequires: libicu-devel +%endif BuildRequires: java-11-openjdk-devel BuildRequires: rpm-build BuildRequires: make @@ -132,13 +135,16 @@ Requires: openblas-serial Requires: lz4 Requires: libzstd Requires: zlib +%if ! 0%{?el7} Requires: libicu +%endif Requires: perf Requires: gdb Requires: net-tools %if 0%{?el7} Requires: llvm5.0 Requires: vespa-openssl >= 1.1.1c-1 +Requires: vespa-icu >= 65.1.0-1 Requires: vespa-protobuf >= 3.7.0-4 %define _vespa_llvm_version 5.0 %define _extra_link_directory /usr/lib64/llvm5.0/lib;%{_vespa_deps_prefix}/lib64 |