- rel 7; unset some variables to get proper JAVA_HOME

Changed files:
    jpackage-utils.spec -> 1.15

diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index d869931343998abd76eab6736008aa5424d59469..59e8b0aa6fbcdd66efbfb39b93fc724249886d41 100644 (file)
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -3,7 +3,7 @@ Summary:        JPackage utilities
 Summary(pl):   Narzêdzia JPackage
 Name:          jpackage-utils
 Version:       1.6.6
-Release:       6
+Release:       7
 Epoch:         0
 License:       BSD-like
 Group:         Development/Languages/Java
@@ -107,6 +107,8 @@ install -pm 644 etc/java.conf $RPM_BUILD_ROOT%{_sysconfdir}/java
 install -pm 644 etc/jpackage-release $RPM_BUILD_ROOT%{_sysconfdir}/java
 install -pm 644 java-utils/* $RPM_BUILD_ROOT%{_javadir}-utils
 
+unset JAVA_HOME || :
+unset JAVACMD || :
 cat << EOF >$RPM_BUILD_ROOT/etc/env.d/JAVA_HOME
 JAVA_HOME="`. %{_javadir}-utils/java-functions; set_jvm; echo $JAVA_HOME`"
 EOF