ade27d18fe
%java_home is unset OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=165
19 lines
573 B
Diff
19 lines
573 B
Diff
Index: javapackages-6.3.2/macros.d/macros.jpackage
|
|
===================================================================
|
|
--- javapackages-6.3.2.orig/macros.d/macros.jpackage
|
|
+++ javapackages-6.3.2/macros.d/macros.jpackage
|
|
@@ -35,10 +35,10 @@ cat > %{buildroot}%{_bindir}/%5 << EOF \
|
|
#\
|
|
# %{name} script\
|
|
# JPackage Project <http://www.jpackage.org/>\
|
|
-\
|
|
+%{?java_home:\
|
|
# Set default JAVA_HOME\
|
|
-export JAVA_HOME="\\${JAVA_HOME:-%{?java_home}}"\
|
|
-\
|
|
+export JAVA_HOME="\\${JAVA_HOME:-%{java_home}}"\
|
|
+}\
|
|
# Source functions library\
|
|
. @{javadir}-utils/java-functions\
|
|
\
|