OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re, openpkg-web, openpkg-src Date: 16-Dec-2002 18:36:17
Branch: HEAD Handle: 2002121617361601
Added files:
openpkg-re/vcheck vc.tomcat4
Modified files:
openpkg-src/tomcat4 rc.tomcat4 tomcat4.spec
openpkg-web news.txt
Log:
Initial Release
Summary:
Revision Changes Path
1.1 +10 -0 openpkg-re/vcheck/vc.tomcat4
1.2 +2 -2 openpkg-src/tomcat4/rc.tomcat4
1.2 +31 -7 openpkg-src/tomcat4/tomcat4.spec
1.2295 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-re/vcheck/vc.tomcat4
============================================================
$ cvs update -p -r1.1 vc.tomcat4
config = {
}
prog tomcat4 = {
version = 4.1.12
url = http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/
regex = (?<!\w)v(\d+\.\d+\.\d+)/
url =
http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v__NEWVER__/bin/
regex = jakarta-tomcat-(__VER__)\.tar\.gz
}
Index: openpkg-src/tomcat4/rc.tomcat4
============================================================
$ cvs diff -u -r1.1 -r1.2 rc.tomcat4
--- openpkg-src/tomcat4/rc.tomcat4 10 Dec 2002 21:23:18 -0000 1.1
+++ openpkg-src/tomcat4/rc.tomcat4 16 Dec 2002 17:36:17 -0000 1.2
@@ -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
Index: openpkg-src/tomcat4/tomcat4.spec
============================================================
$ cvs diff -u -r1.1 -r1.2 tomcat4.spec
--- openpkg-src/tomcat4/tomcat4.spec 10 Dec 2002 21:23:18 -0000 1.1
+++ openpkg-src/tomcat4/tomcat4.spec 16 Dec 2002 17:36:17 -0000 1.2
@@ -32,7 +32,7 @@
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 @@
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 @@
-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
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.2294 -r1.2295 news.txt
--- openpkg-web/news.txt 16 Dec 2002 16:18:22 -0000 1.2294
+++ openpkg-web/news.txt 16 Dec 2002 17:36:16 -0000 1.2295
@@ -1,3 +1,4 @@
+16-Dec-2002: Upgraded package: P<tomcat4-4.1.12-20021216>
16-Dec-2002: Upgraded package: P<asgui-0.5.5-20021216>
16-Dec-2002: Upgraded package: P<al-0.9.1-20021216>
16-Dec-2002: Upgraded package: P<sa-1.0.2-20021216>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
