From 7d0005b465b5f16ab169da3b59959eef0c7f6fd7d92cdf058660b7eda6f4dfb3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 3 Oct 2024 13:18:03 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat10?expand=0&rev=49 --- tomcat-digest.script | 3 +++ tomcat-tool-wrapper.script | 3 +++ tomcat10.changes | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/tomcat-digest.script b/tomcat-digest.script index fae10b3..2f3cacf 100644 --- a/tomcat-digest.script +++ b/tomcat-digest.script @@ -3,6 +3,9 @@ # tomcat-digest script # JPackage Project +# Set default JAVA_HOME +export JAVA_HOME="${JAVA_HOME:-%{?java_home}}" + # Source functions library if [ -f /usr/share/java-utils/java-functions ] ; then . /usr/share/java-utils/java-functions diff --git a/tomcat-tool-wrapper.script b/tomcat-tool-wrapper.script index 9ab51c6..a342e17 100644 --- a/tomcat-tool-wrapper.script +++ b/tomcat-tool-wrapper.script @@ -3,6 +3,9 @@ # tomcat-digest script # JPackage Project +# Set default JAVA_HOME +export JAVA_HOME="${JAVA_HOME:-%{?java_home}}" + # Source functions library if [ -f /usr/share/java-utils/java-functions ] ; then . /usr/share/java-utils/java-functions diff --git a/tomcat10.changes b/tomcat10.changes index 8a12f2c..af6b447 100644 --- a/tomcat10.changes +++ b/tomcat10.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 3 13:17:40 UTC 2024 - Fridrich Strba + +- Adapt the scripts to run also with javapackages-tools >= 6.3 + ------------------------------------------------------------------- Sun Sep 29 19:42:27 UTC 2024 - Fridrich Strba