OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 27-Aug-2007 10:40:24 Branch: HEAD Handle: 2007082709402400 Modified files: openpkg-src/groovy groovy.spec Log: switch to new Java toolkit world order Summary: Revision Changes Path 1.2 +3 -3 openpkg-src/groovy/groovy.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/groovy/groovy.spec ============================================================================ $ cvs diff -u -r1.1 -r1.2 groovy.spec --- openpkg-src/groovy/groovy.spec 25 Aug 2007 18:50:23 -0000 1.1 +++ openpkg-src/groovy/groovy.spec 27 Aug 2007 08:40:24 -0000 1.2 @@ -33,7 +33,7 @@ Group: Language License: BSD-style Version: 1.0 -Release: 20070825 +Release: 20070827 # list of sources Source0: http://dist.codehaus.org/groovy/distributions/groovy-%{version}.tar.gz @@ -42,7 +42,7 @@ Prefix: %{l_prefix} BuildRoot: %{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20060823 -PreReq: OpenPKG, openpkg >= 20060823 +PreReq: OpenPKG, openpkg >= 20060823, java, java-jdk15 AutoReq: no AutoReqProv: no @@ -73,7 +73,7 @@ $RPM_BUILD_ROOT%{l_prefix}/libexec/groovy for program in grok groovy groovyConsole groovyc groovysh java2groovy; do ( echo "#!/bin/sh" - echo "JAVA_HOME=\"%{l_prefix}/libexec/j2se\"; export JAVA_HOME" + echo "eval \`JAVA_PLATFORM=\"sun-jdk\" %{l_prefix}/bin/java-toolkit -e\`" echo "GROOVY_HOME=\"%{l_prefix}/libexec/groovy\"; export GROOVY_HOME" echo "exec %{l_prefix}/libexec/groovy/bin/$program \"[EMAIL PROTECTED]"" ) >$program.sh @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org