Update vespa spec for CentOS 8.

1 files changed, 29 insertions, 0 deletions

diff --git a/dist/vespa.spec b/dist/vespa.spec
index b55d7e4125a..c90526c92f2 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -18,6 +18,7 @@ Source0:        vespa-%{version}.tar.gz
 
 %if 0%{?centos}
 BuildRequires: epel-release
+%if 0%{?el7}
 BuildRequires: centos-release-scl
 BuildRequires: devtoolset-8-gcc-c++
 BuildRequires: devtoolset-8-libatomic-devel
@@ -26,12 +27,19 @@ BuildRequires: rh-maven35
 %define _devtoolset_enable /opt/rh/devtoolset-8/enable
 %define _rhmaven35_enable /opt/rh/rh-maven35/enable
 %endif
+%if 0%{?el8}
+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
 BuildRequires: vespa-boost-devel >= 1.59.0-6
@@ -39,6 +47,15 @@ BuildRequires: vespa-gtest >= 1.8.1-1
 BuildRequires: vespa-protobuf-devel >= 3.7.0-4
 BuildRequires: vespa-openssl-devel >= 1.1.1c-1
 %endif
+%if 0%{?el8}
+BuildRequires: cmake >= 3.11.4-3
+BuildRequires: llvm-devel >= 7.0.1-3
+BuildRequires: boost-devel >= 1.66
+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
@@ -99,7 +116,9 @@ Requires: perl-IO-Socket-IP
 Requires: perl-JSON
 Requires: perl-libwww-perl
 Requires: perl-LWP-Protocol-https
+%if !(0%{?centos} && 0%{?el8})
 Requires: perl-Net-INET6Glue
+%endif
 Requires: perl-Pod-Usage
 Requires: perl-URI
 Requires: valgrind
@@ -114,6 +133,7 @@ Requires: perf
 Requires: gdb
 Requires: net-tools
 %if 0%{?centos}
+%if 0%{?el7}
 Requires: llvm5.0
 Requires: vespa-openssl >= 1.1.1c-1
 Requires: vespa-protobuf >= 3.7.0-4
@@ -121,6 +141,15 @@ Requires: vespa-protobuf >= 3.7.0-4
 %define _extra_link_directory /usr/lib64/llvm5.0/lib;%{_vespa_deps_prefix}/lib64
 %define _extra_include_directory /usr/include/llvm5.0;%{_vespa_deps_prefix}/include
 %endif
+%if 0%{?el8}
+Requires: llvm-libs >= 7.0.1-3
+Requires: vespa-protobuf >= 3.7.0-4
+Requires: openssl-libs
+%define _vespa_llvm_version 7.0
+%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