Initial Release

tomcat4/rc.tomcat4

@@ -7,14 +7,14 @@
     tomcat4_enable="yes"
     tomcat4_home="@l_prefix@/libexec/tomcat"
 
-%start -p 100
+%start -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/startup.sh
     fi
 
-%stop -p 100
+%stop -p 200 -u @l_rusr@
     if opServiceEnabled tomcat4; then
         JAVA_HOME="$j2se_home"; export JAVA_HOME
         CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME

tomcat4/tomcat4.spec

@@ -32,7 +32,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Web
 License:      Apache Software License 1.1
 Version:      4.1.12
-Release:      20021205
+Release:      20021216
 
 #   list of sources
 Source0:      http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
@@ -77,6 +77,18 @@ Conflicts:    tomcat
         cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/; \
         %{l_tar} -xf - )
 
+    #   move ${jkHome}/conf to var
+    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
+    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
+
     #   patch paths for logs and temp
     %{l_shtool} subst \
         -e 's;directory="logs";directory="%{l_prefix}/var/tomcat/log";' \
@@ -85,24 +97,36 @@ Conflicts:    tomcat
         -e 's;"$CATALINA_BASE"/temp;%{l_prefix}/var/tomcat/temp;' \
         -e 's;"$CATALINA_BASE"/logs;%{l_prefix}/var/tomcat/log;' \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/bin/catalina.sh
-    #   provide symlink for ${jkHome}/work
-    ln -s \
-        %{l_prefix}/var/tomcat/work \
-        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/work
 
     #   make scripts executable
     chmod 755 $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/bin/*
 
     #   install run-command script
-    %{l_shtool} install -c -m 755 -e 's;@l_prefix@;%{l_prefix};g' \
+    %{l_shtool} install -c -m 755 \
+        -e 's;@l_prefix@;%{l_prefix};g' \
+        -e 's;@l_rusr@;%{l_rusr};g' \
+        -e 's;@l_rgrp@;%{l_rgrp};g' \
         %{SOURCE rc.tomcat4} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
+    #   determine package files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%config %{l_prefix}/etc/tomcat/*'
+        '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/log' \
+        '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/temp' \
+        '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/work' \
+        '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/conf'
 
 %files -f files
 
 %clean
     rm -rf $RPM_BUILD_ROOT
 
+%preun
+    if [ $1 -eq 0 ]; then
+        # remove log files
+        rm -f $RPM_INSTALL_PREFIX/var/tomcat/log/*
+        rm -rf $RPM_INSTALL_PREFIX/var/tomcat/temp/*
+        rm -rf $RPM_INSTALL_PREFIX/var/tomcat/work/*
+        rm -f $RPM_INSTALL_PREFIX/var/tomcat/conf/jk2.properties.save
+    fi
+