From 88b62b2ae03e85caa05211fa7920f41c4372ec78 Mon Sep 17 00:00:00 2001
From: Michael van Elst <mlestv@openpkg.org>
Date: Mon, 20 Jan 2003 12:51:55 +0000
Subject: [PATCH] provide rc %restart, move webapps from libexec to var, enable
 WARP connector

---
 tomcat4/rc.tomcat4   |  8 ++++++++
 tomcat4/tomcat4.spec | 17 +++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/tomcat4/rc.tomcat4 b/tomcat4/rc.tomcat4
index 543a8a0b14..9a586d81a3 100644
--- a/tomcat4/rc.tomcat4
+++ b/tomcat4/rc.tomcat4
@@ -14,6 +14,14 @@
         $CATALINA_HOME/bin/startup.sh
     fi
 
+%restart -p 200 -u @l_rusr@
+    if opServiceEnabled tomcat4; then
+        JAVA_HOME="$j2se_home"; export JAVA_HOME
+        CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
+        $CATALINA_HOME/bin/shutdown.sh
+        $CATALINA_HOME/bin/startup.sh
+    fi
+
 %stop -p 200 -u @l_rusr@
     if opServiceEnabled tomcat4; then
         JAVA_HOME="$j2se_home"; export JAVA_HOME
diff --git a/tomcat4/tomcat4.spec b/tomcat4/tomcat4.spec
index 39faea0d1d..762931425d 100644
--- a/tomcat4/tomcat4.spec
+++ b/tomcat4/tomcat4.spec
@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Web
 License:      Apache Software License 1.1
 Version:      4.1.18
-Release:      20030108
+Release:      20030120
 
 #   list of sources
 Source0:      http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
@@ -81,18 +81,27 @@ Conflicts:    tomcat
     mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf \
        $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf
 
-    #   provide symlink for ${jkHome}/work and ${jkHome}/conf
+    #   move ${jkHome}/webapps to var
+    mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/webapps \
+       $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/webapps
+
+    #   provide symlink for ${jkHome}/{work,conf,webapps}
     ln -s \
         %{l_prefix}/var/tomcat/work \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/work
     ln -s \
         %{l_prefix}/var/tomcat/conf \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf
+    ln -s \
+        %{l_prefix}/var/tomcat/webapps \
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/webapps
 
     #   patch paths for logs and temp
-    %{l_shtool} subst \
+    %{l_shtool} -d subst \
         -e 's;directory="logs";directory="%{l_prefix}/var/tomcat/log";' \
-        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf/server.xml
+        -e '13,$s;^<!--.*;;' \
+        -e '13,$s;^-->;;' \
+        $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf/server.xml
     %{l_shtool} subst \
         -e 's;"$CATALINA_BASE"/temp;%{l_prefix}/var/tomcat/temp;' \
         -e 's;"$CATALINA_BASE"/logs;%{l_prefix}/var/tomcat/log;' \