diff --git a/j2se/j2se.spec b/j2se/j2se.spec index 2c8869c2a8..7fcb095272 100644 --- a/j2se/j2se.spec +++ b/j2se/j2se.spec @@ -42,7 +42,7 @@ Distribution: OpenPKG [EVAL] Group: Language License: Commercial Version: %{V_openpkg} -Release: 20030117 +Release: 20030218 # package options %option with_native yes diff --git a/j2se/rc.j2se b/j2se/rc.j2se index 649f226cce..516f7ced98 100644 --- a/j2se/rc.j2se +++ b/j2se/rc.j2se @@ -6,10 +6,14 @@ %config j2se_enable="yes" j2se_home="@l_prefix@/libexec/j2se" + # generic variables for JDK/JRE packages + jre_home=$j2se_home + jdk_home=$j2se_home + java_home=$j2se_home %env if opServiceEnabled j2se; then - JAVA_HOME="$j2se_home" + JAVA_HOME="$java_home" export JAVA_HOME fi diff --git a/j2se14/rc.j2se14 b/j2se14/rc.j2se14 index 96268da0ed..3cf2ef3f8d 100644 --- a/j2se14/rc.j2se14 +++ b/j2se14/rc.j2se14 @@ -6,11 +6,13 @@ %config j2se14_enable="yes" j2se14_home="@l_prefix@/libexec/j2se14" - j2se_home="@l_prefix@/libexec/j2se14" + jre_home=$j2se14_home + jdk_home=$j2se14_home + java_home=$j2se14_home %env if opServiceEnabled j2se14; then - JAVA_HOME="$j2se14_home" + JAVA_HOME="$java_home" export JAVA_HOME fi