diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2022-06-08 13:49:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-08 13:49:15 +0200 |
| commit | 66d84ff905c5998f756770ea402c93c53846ddab (patch) | |
| tree | bfece5a9779fb5d20f12e0b2d7f4c1b10d1223a9 /dist | |
| parent | 14ceb2e5596a30d63a0ae3ea6262f2f41bed93e7 (diff) | |
| parent | e68334191733421bd3772b224a81b1abbb080424 (diff) | |
Merge pull request #22935 from vespa-engine/aressem/prepare-centos-stream8-use
Test CentOS Stream 8 [run-systemtest] MERGEOK
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index d43e6caa1ff..6902adcb079 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -226,9 +226,9 @@ BuildRequires: zlib-devel BuildRequires: libicu-devel %endif %if 0%{?el7} && 0%{?amzn2} -BuildRequires: java-11-amazon-corretto +BuildRequires: java-17-amazon-corretto %else -BuildRequires: java-11-openjdk-devel +BuildRequires: java-17-openjdk-devel %endif BuildRequires: rpm-build BuildRequires: make @@ -365,9 +365,9 @@ Vespa - The open big data serving engine Summary: Vespa - The open big data serving engine - base %if 0%{?el7} && 0%{?amzn2} -Requires: java-11-amazon-corretto +Requires: java-17-amazon-corretto %else -Requires: java-11-openjdk-devel +Requires: java-17-openjdk-devel %endif Requires: perl Requires: perl-Getopt-Long @@ -597,7 +597,7 @@ source %{_rhgit227_enable} || true %if 0%{?_java_home:1} export JAVA_HOME=%{?_java_home} %else -export JAVA_HOME=/usr/lib/jvm/java-11-openjdk +export JAVA_HOME=/usr/lib/jvm/java-17-openjdk %endif export PATH="$JAVA_HOME/bin:$PATH" export FACTORY_VESPA_VERSION=%{version} @@ -648,7 +648,7 @@ cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa.service %{buildroot}/usr/lib cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa-configserver.service %{buildroot}/usr/lib/systemd/system %endif -ln -s /usr/lib/jvm/jre-11-openjdk %{buildroot}/%{_prefix}/jdk +ln -s /usr/lib/jvm/jre-17-openjdk %{buildroot}/%{_prefix}/jdk %clean rm -rf $RPM_BUILD_ROOT |