OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 18-Feb-2003 12:15:21
Branch: HEAD Handle: 2003021811151802
Modified files:
openpkg-src/tomcat rc.tomcat tomcat.patch tomcat.spec
openpkg-web news.txt
Log:
reviving tomcat 3
Summary:
Revision Changes Path
1.6 +12 -4 openpkg-src/tomcat/rc.tomcat
1.6 +1 -1 openpkg-src/tomcat/tomcat.patch
1.22 +49 -6 openpkg-src/tomcat/tomcat.spec
1.3343 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/rc.tomcat
============================================================================
$ cvs diff -u -r1.5 -r1.6 rc.tomcat
--- openpkg-src/tomcat/rc.tomcat 3 Jan 2002 10:09:39 -0000 1.5
+++ openpkg-src/tomcat/rc.tomcat 18 Feb 2003 11:15:20 -0000 1.6
@@ -7,18 +7,26 @@
tomcat_enable="yes"
tomcat_home="@l_prefix@/libexec/tomcat"
-%start -p 100 -u root
+%start -p 200 -u @l_rusr@
if opServiceEnabled tomcat; then
JAVA_HOME="$jdk_home"; export JAVA_HOME
TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
- @l_prefix@/libexec/tomcat/bin/tomcat.sh start
+ $TOMCAT_HOME/bin/tomcat.sh start
fi
-%stop -p 100 -u root
+%restart -p 200 -u @l_rusr@
if opServiceEnabled tomcat; then
JAVA_HOME="$jdk_home"; export JAVA_HOME
TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
- @l_prefix@/libexec/tomcat/bin/tomcat.sh stop
+ $TOMCAT_HOME/bin/tomcat.sh stop
+ $TOMCAT_HOME/bin/tomcat.sh start
+ fi
+
+%stop -p 200 -u @l_rusr@
+ if opServiceEnabled tomcat; then
+ JAVA_HOME="$jdk_home"; export JAVA_HOME
+ TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
+ $TOMCAT_HOME/bin/tomcat.sh stop
fi
%env
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 tomcat.patch
--- openpkg-src/tomcat/tomcat.patch 3 Feb 2003 14:11:09 -0000 1.5
+++ openpkg-src/tomcat/tomcat.patch 18 Feb 2003 11:15:20 -0000 1.6
@@ -1,5 +1,5 @@
--- conf/server.xml.dist Sat Feb 1 00:31:43 2003
-+++ conf/server.xml Sat Feb 1 00:33:51 2003
++++ conf/server.xml Tue Feb 18 11:34:28 2003
@@ -15,7 +15,8 @@
<TrustedLoader />
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec 3 Feb 2003 14:11:09 -0000 1.21
+++ openpkg-src/tomcat/tomcat.spec 18 Feb 2003 11:15:20 -0000 1.22
@@ -29,11 +29,11 @@
URL: http://jakarta.apache.org/
Vendor: Apache Software Foundation
Packager: The OpenPKG Project
-Distribution: OpenPKG [JUNK]
+Distribution: OpenPKG [EVAL]
Group: Web
License: Apache Software License 1.1
Version: 3.3.1a
-Release: 20030203
+Release: 20030218
# list of sources
Source0:
http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
@@ -66,7 +66,8 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat \
$RPM_BUILD_ROOT%{l_prefix}/share/tomcat/doc \
- $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/log
+ $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/log \
+ $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/work
# unpack vendor distribution and relocate to final location
%{l_tar} -cf - --exclude lib/test \
@@ -81,19 +82,61 @@
sed -e 's;@l_prefix@;%{l_prefix};g' | %{l_patch} -p0
)
+ # move conf to var
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf \
+ $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf
+
+ # move webapps to var
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/webapps \
+ $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/webapps
+
+ # provide symlinks for conf,webapps,work,logs to var
+ 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
+ ln -s \
+ %{l_prefix}/var/tomcat/log \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/logs
+ 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' \
- %{SOURCE rc.tomcat} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ %{l_shtool} install -c -m 755 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ -e 's;@l_rusr@;%{l_rusr};g' \
+ %{SOURCE rc.tomcat} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
%{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/work' \
+ '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/conf' \
+ '%attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/tomcat/webapps'
%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/work/*
+ rm -rf $RPM_INSTALL_PREFIX/var/tomcat/conf/*.id
+ # remove "deployed" webapps
+ for i in $RPM_INSTALL_PREFIX/var/tomcat/webapps/*; do
+ if test -d $i ; then
+ rm -rf $i
+ fi
+ done
+ fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3342 -r1.3343 news.txt
--- openpkg-web/news.txt 18 Feb 2003 10:41:34 -0000 1.3342
+++ openpkg-web/news.txt 18 Feb 2003 11:15:18 -0000 1.3343
@@ -1,3 +1,4 @@
+18-Feb-2003: Upgraded package: P<tomcat-3.3.1a-20030218>
18-Feb-2003: Upgraded package: P<vim-6.1.341-20030218>
18-Feb-2003: Upgraded package: P<postfix-2.0.3-20030218>
18-Feb-2003: Upgraded package: P<php-4.3.1-20030218>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
