diff options
| author | gjoranv <gv@oath.com> | 2018-09-04 11:31:25 +0200 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:20 +0100 |
| commit | 2139bdfc326ab7aa208dbd745b53688d49b51f05 (patch) | |
| tree | ea769c729aa611270486ecc8b6f4179b73db5cd4 /dist/vespa.spec | |
| parent | 218d7f7e2f3b0f728e1c4f22615fe9ed2ec8c122 (diff) | |
Revert "Install and require OpenJDK 10."
This reverts commit 86b33fc0d95716454a5804b25a463a03ef8ca3ba.
Diffstat (limited to 'dist/vespa.spec')
| -rw-r--r-- | dist/vespa.spec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 16aff3ae849..6aeb099e8fb 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -67,7 +67,7 @@ BuildRequires: lz4-devel BuildRequires: libzstd-devel BuildRequires: zlib-devel BuildRequires: libicu-devel -BuildRequires: java-10-openjdk-devel +BuildRequires: java-1.8.0-openjdk-devel BuildRequires: openssl-devel BuildRequires: rpm-build BuildRequires: make @@ -132,7 +132,7 @@ Requires: llvm-libs >= 7.0.0 %define _extra_link_directory /opt/vespa-cppunit/lib%{?_vespa_llvm_link_directory:;%{_vespa_llvm_link_directory}}%{?_vespa_gtest_link_directory:;%{_vespa_gtest_link_directory}} %define _extra_include_directory /opt/vespa-cppunit/include%{?_vespa_llvm_include_directory:;%{_vespa_llvm_include_directory}}%{?_vespa_gtest_include_directory:;%{_vespa_gtest_include_directory}} %endif -Requires: java-10-openjdk +Requires: java-1.8.0-openjdk Requires: openssl Requires: vespa-cppunit >= 1.12.1-6 Requires(pre): shadow-utils @@ -162,7 +162,7 @@ cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ -DEXTRA_LINK_DIRECTORY="%{_extra_link_directory}" \ -DEXTRA_INCLUDE_DIRECTORY="%{_extra_include_directory}" \ - -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64%{?_extra_link_directory:;%{_extra_link_directory}};/usr/lib/jvm/java-10/jre/lib/amd64/server" \ + -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64%{?_extra_link_directory:;%{_extra_link_directory}};/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \ %{?_vespa_llvm_version:-DVESPA_LLVM_VERSION="%{_vespa_llvm_version}"} \ . |