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:50:29
Branch: HEAD Handle: 2007082709502800
Modified files:
openpkg-src/tomcat rc.tomcat tomcat.spec
Log:
switch to new Java toolkit world order
Summary:
Revision Changes Path
1.20 +2 -2 openpkg-src/tomcat/rc.tomcat
1.61 +2 -2 openpkg-src/tomcat/tomcat.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/rc.tomcat
============================================================================
$ cvs diff -u -r1.19 -r1.20 rc.tomcat
--- openpkg-src/tomcat/rc.tomcat 25 Aug 2006 19:20:07 -0000 1.19
+++ openpkg-src/tomcat/rc.tomcat 27 Aug 2007 08:50:28 -0000 1.20
@@ -30,7 +30,7 @@
%start -u @l_rusr@
rcService tomcat enable yes || exit 0
rcService tomcat active yes && exit 0
- JAVA_HOME="$JDK_home"; export JAVA_HOME
+ eval `JAVA_PLATFORM="sun-jdk" @l_prefix@/bin/java-toolkit -e`
CATALINA_HOME="$tomcat_home"; export CATALINA_HOME
CATALINA_PID="$tomcat_pidfile"; export CATALINA_PID
$CATALINA_HOME/bin/startup.sh
@@ -38,7 +38,7 @@
%stop -u @l_rusr@
rcService tomcat enable yes || exit 0
rcService tomcat active no && exit 0
- JAVA_HOME="$JDK_home"; export JAVA_HOME
+ eval `JAVA_PLATFORM="sun-jdk" @l_prefix@/bin/java-toolkit -e`
CATALINA_HOME="$tomcat_home"; export CATALINA_HOME
CATALINA_PID="$tomcat_pidfile"; export CATALINA_PID
$CATALINA_HOME/bin/shutdown.sh
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.spec
============================================================================
$ cvs diff -u -r1.60 -r1.61 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec 9 Aug 2007 14:56:07 -0000 1.60
+++ openpkg-src/tomcat/tomcat.spec 27 Aug 2007 08:50:28 -0000 1.61
@@ -33,7 +33,7 @@
Group: Web
License: Apache Software License 2.0
Version: 6.0.14
-Release: 20070809
+Release: 20070827
# list of sources
Source0:
http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/bin/apache-tomcat-%{version}.tar.gz
@@ -43,7 +43,7 @@
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
-PreReq: OpenPKG, openpkg >= 20060823, j2se >= 1.5
+PreReq: OpenPKG, openpkg >= 20060823, java, java-jdk15
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
