SPECS: jython.spec - use jpackage-utils also on runtime (to get ri...

[jajcus]

Author: jajcus                       Date: Sun May 21 17:46:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use jpackage-utils also on runtime (to get right JVM)

---- Files affected:
SPECS:
   jython.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/jython.spec
diff -u SPECS/jython.spec:1.15 SPECS/jython.spec:1.16
--- SPECS/jython.spec:1.15	Sun May 21 19:37:30 2006
+++ SPECS/jython.spec	Sun May 21 19:46:10 2006
@@ -11,7 +11,9 @@
 # Source0-md5:	e3e6be56646fb7cd6d19a6a69bd76e2f
 URL:		http://www.jython.org/
 BuildRequires:	jdk
+BuildRequires:	jpackage-utils
 Requires:	jre
+Requires:	jpackage-utils
 BuildArch:	noarch
 ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -87,6 +89,7 @@
 
 %build
 unset CLASSPATH || :
+unset JAVA_HOME || :
 export JAVA_HOME="%{java_home}" 
 java -classpath . jython-21 -o . demo lib source
 
@@ -112,7 +115,10 @@
 cat >$RPM_BUILD_ROOT/%{_bindir}/%{name} <<EOF
 #/bin/sh
 
-"%{java}" -Dpython.home="%{_datadir}/%{name}" -classpath "%{_javadir}/%{name}-%{version}.jar:\$CLASSPATH" "org.python.util.jython" "\$@"
+. %{_javadir}-utils/java-functions
+set_javacmd
+
+\$JAVACMD -Dpython.home="%{_datadir}/%{name}" -classpath "%{_javadir}/%{name}-%{version}.jar:\$CLASSPATH" "org.python.util.jython" "\$@"
 EOF
 
 cat >$RPM_BUILD_ROOT/%{_bindir}/jythonc <<EOF
@@ -170,6 +176,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/05/21 17:46:10  jajcus
+- use jpackage-utils also on runtime (to get right JVM)
+
 Revision 1.15  2006/05/21 17:37:30  glen
 - drop unneccessary unset JAVA_HOME
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jython.spec?r1=1.15&r2=1.16&f=u