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:44:16
Branch: HEAD Handle: 2007082709441600
Modified files:
openpkg-src/ant ant.conf ant.spec
Log:
switch to new Java toolkit world order
Summary:
Revision Changes Path
1.4 +2 -0 openpkg-src/ant/ant.conf
1.47 +2 -2 openpkg-src/ant/ant.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.conf
============================================================================
$ cvs diff -u -r1.3 -r1.4 ant.conf
--- openpkg-src/ant/ant.conf 9 May 2005 21:40:55 -0000 1.3
+++ openpkg-src/ant/ant.conf 27 Aug 2007 08:44:16 -0000 1.4
@@ -2,6 +2,8 @@
## @l_prefix@/etc/ant/ant.conf -- Configuration file of Apache Ant build
tool
##
+eval `JAVA_PLATFORM="sun-jdk" @l_prefix@/bin/java-toolkit -e`
+
ANT_HOME="@l_prefix@/libexec/ant"
export ANT_HOME
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ant/ant.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 ant.spec
--- openpkg-src/ant/ant.spec 19 Jul 2007 04:24:48 -0000 1.46
+++ openpkg-src/ant/ant.spec 27 Aug 2007 08:44:16 -0000 1.47
@@ -37,7 +37,7 @@
Group: Building
License: Apache Software License
Version: %{V_ant}
-Release: 20070719
+Release: 20070827
# package options
%option with_docs no
@@ -52,7 +52,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823, infozip
-PreReq: OpenPKG, openpkg >= 20060823, JRE
+PreReq: OpenPKG, openpkg >= 20060823, java, java-jdk15
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
