From 637e4be9a46812a99645521530770ce2d10115bd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Oct 2019 17:09:01 +0200 Subject: [PATCH] Switch to OpenJDK 11 as default JDK --- javapackages-tools.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index b228de9..e1b1086 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -20,12 +20,12 @@ %global rpmmacrodir /etc/rpm %endif -%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk -%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk +%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-11-openjdk +%global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-11-openjdk Name: javapackages-tools Version: 5.3.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Macros and scripts for Java packaging support @@ -57,7 +57,7 @@ Requires: coreutils Requires: findutils Requires: which # default JRE -Requires: java-1.8.0-openjdk-headless +Requires: java-11-openjdk-headless Provides: jpackage-utils = %{version}-%{release} # These could be generated automatically, but then we would need to @@ -144,7 +144,7 @@ Requires: xmvn-install Requires: xmvn-subst Requires: xmvn-resolve # Java build systems don't have hard requirement on java-devel, so it should be there -Requires: java-1.8.0-openjdk-devel +Requires: java-11-openjdk-devel Requires: %{python_prefix}-javapackages = %{version}-%{release} Requires: %{python_interpreter} @@ -204,6 +204,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %license LICENSE %changelog +* Tue Apr 28 2020 Mikolaj Izdebski - 5.3.0-10 +- Switch to OpenJDK 11 as default JDK + * Wed Jan 29 2020 Fedora Release Engineering - 5.3.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild