SPECS: jpackage-utils.spec - set $JAVA_HOME here, so it will work ...

[jajcus]

Author: jajcus                       Date: Sat May 20 17:31:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- set $JAVA_HOME here, so it will work for any jpackage-compatible jvm package

---- Files affected:
SPECS:
   jpackage-utils.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/jpackage-utils.spec
diff -u SPECS/jpackage-utils.spec:1.2 SPECS/jpackage-utils.spec:1.3
--- SPECS/jpackage-utils.spec:1.2	Sat May 20 00:10:13 2006
+++ SPECS/jpackage-utils.spec	Sat May 20 19:31:34 2006
@@ -60,7 +60,7 @@
 done
 
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/java,${_jvmdir}} \
-	$RPM_BUILD_ROOT{/usr/lib/rpm,${_jvmdir},${_javadocdir}} \
+	$RPM_BUILD_ROOT{/usr/lib/rpm,/etc/env.d,${_jvmdir},${_javadocdir}} \
 	$RPM_BUILD_ROOT{${_jvmjardir},${_jvmprivdir},${_jvmlibdir},${_jvmdatadir}} \
 	$RPM_BUILD_ROOT{${_jvmsysconfdir},${_jvmcommonlibdir},${_jvmcommondatadir}} \
 	$RPM_BUILD_ROOT{${_jvmcommonsysconfdir},${_javadir},${_jnidir}} \
@@ -122,6 +122,9 @@
 ${_javadir}-utils/*
 EOF
 
+cat << EOF >$RPM_BUILD_ROOT/etc/env.d/JAVA_HOME
+JAVA_HOME="`. %{_javadir}-utils/java-functions; set_jvm; echo $JAVA_HOME`"
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,6 +137,7 @@
 %config %{_sysconfdir}/java/jpackage-release
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/java/java.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/java/font.properties
+%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
 /usr/lib/rpm/macros.java
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -142,6 +146,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/05/20 17:31:34  jajcus
+- set $JAVA_HOME here, so it will work for any jpackage-compatible jvm package
+
 Revision 1.2  2006/05/19 22:10:13  glen
 - %distribution macro is undefined
 
================================================================

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