diff options
| author | Tor Egge <Tor.Egge@verizonmedia.com> | 2019-10-30 15:48:32 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@verizonmedia.com> | 2019-10-30 15:54:01 +0100 |
| commit | c41e09267203f5f9be7f09ce96c298e1065ab7b5 (patch) | |
| tree | a07f0581baea9f55b3968ada40fcb0b00affc813 /dist | |
| parent | c7986fb1cc772f1fafd80f54784281b533ff9832 (diff) | |
Update vespa spec for RHEL 7.
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index c90526c92f2..de5bc4613d2 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -20,6 +20,9 @@ Source0: vespa-%{version}.tar.gz BuildRequires: epel-release %if 0%{?el7} BuildRequires: centos-release-scl +%endif +%endif +%if 0%{?el7} BuildRequires: devtoolset-8-gcc-c++ BuildRequires: devtoolset-8-libatomic-devel BuildRequires: devtoolset-8-binutils @@ -32,13 +35,11 @@ BuildRequires: gcc-c++ BuildRequires: libatomic BuildRequires: maven %endif -%endif %if 0%{?fedora} BuildRequires: gcc-c++ BuildRequires: libatomic %endif BuildRequires: Judy-devel -%if 0%{?centos} %if 0%{?el7} BuildRequires: cmake3 BuildRequires: llvm5.0-devel @@ -55,7 +56,6 @@ BuildRequires: openssl-devel BuildRequires: vespa-gtest >= 1.8.1-1 BuildRequires: vespa-protobuf-devel >= 3.7.0-4 %endif -%endif %if 0%{?fedora} BuildRequires: cmake >= 3.9.1 BuildRequires: maven @@ -132,7 +132,6 @@ Requires: libicu Requires: perf Requires: gdb Requires: net-tools -%if 0%{?centos} %if 0%{?el7} Requires: llvm5.0 Requires: vespa-openssl >= 1.1.1c-1 @@ -149,7 +148,6 @@ Requires: openssl-libs %define _extra_link_directory %{_vespa_deps_prefix}/lib64 %define _extra_include_directory %{_vespa_deps_prefix}/include %endif -%endif %if 0%{?fedora} Requires: vespa-protobuf >= 3.7.0-4 Requires: openssl-libs |