SPECS: jpackage-utils.spec - avoid $JAVA_HOME containing errors fr...

[glen]

Author: glen                         Date: Thu Jan 11 12:22:46 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- avoid $JAVA_HOME containing errors from set_jvm

---- Files affected:
SPECS:
   jpackage-utils.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/jpackage-utils.spec
diff -u SPECS/jpackage-utils.spec:1.19 SPECS/jpackage-utils.spec:1.20
--- SPECS/jpackage-utils.spec:1.19	Thu Nov 30 16:21:43 2006
+++ SPECS/jpackage-utils.spec	Thu Jan 11 13:22:41 2007
@@ -4,7 +4,7 @@
 Summary(pl):	Narzędzia JPackage
 Name:		jpackage-utils
 Version:	1.6.6
-Release:	11
+Release:	11.1
 Epoch:		0
 License:	BSD-like
 Group:		Development/Languages/Java
@@ -83,7 +83,7 @@
 install -pm 755 bin/* $RPM_BUILD_ROOT%{_bindir}
 install -pm 644 etc/font.properties $RPM_BUILD_ROOT%{_sysconfdir}/java
 
-cat > etc/java.conf << EOF
+cat > etc/java.conf << 'EOF'
 # System-wide Java configuration file                                -*- sh -*-
 #
 # JPackage Project <http://www.jpackage.org/>
@@ -98,7 +98,7 @@
 JVM_ROOT=%{_jvmdir}
 
 # You can define a system-wide JVM root here if you're not using the default one
-#JAVA_HOME=\$JVM_ROOT/java
+#JAVA_HOME=$JVM_ROOT/java
 
 # Options to pass to the java interpreter
 JAVACMD_OPTS=
@@ -108,10 +108,8 @@
 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)
+JAVA_HOME=$(. %{_javadir}-utils/java-functions; set_jvm >&2; echo "$JAVA_HOME")
 EOF
 
 %clean
@@ -154,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2007/01/11 12:22:41  glen
+- avoid $JAVA_HOME containing errors from set_jvm
+
 Revision 1.19  2006/11/30 15:21:43  glen
 - rel 11: do not set JAVA_HOME env file contents at compile time
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jpackage-utils.spec?r1=1.19&r2=1.20&f=u