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: 04-Jul-2007 17:38:51
Branch: HEAD Handle: 2007070416385000
Modified files:
openpkg-src/tomcat tomcat.spec
Log:
work-off packaging of Tomcat
Summary:
Revision Changes Path
1.59 +20 -23 openpkg-src/tomcat/tomcat.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat/tomcat.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 tomcat.spec
--- openpkg-src/tomcat/tomcat.spec 4 Jul 2007 15:16:48 -0000 1.58
+++ openpkg-src/tomcat/tomcat.spec 4 Jul 2007 15:38:50 -0000 1.59
@@ -71,6 +71,7 @@
# create installation tree
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/tomcat \
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat \
$RPM_BUILD_ROOT%{l_prefix}/share/tomcat/doc \
$RPM_BUILD_ROOT%{l_prefix}/var/tomcat/log \
@@ -85,29 +86,31 @@
%{l_tar} -xf -
) || exit $?
- # move ${jkHome}/conf to var
- mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf \
- $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/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
+ # relocate configuration directory
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf/* \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/tomcat/
+ rmdir \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf
ln -s \
- %{l_prefix}/var/tomcat/conf \
+ %{l_prefix}/etc/tomcat \
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/conf
+
+ # relocate web application directory
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/webapps \
+ $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/webapps
ln -s \
%{l_prefix}/var/tomcat/webapps \
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/webapps
- # patch paths for logs and temp
+ # relocate working directory
+ ln -s \
+ %{l_prefix}/var/tomcat/work \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/work
+
+ # relocate logfile and temporary directory
%{l_shtool} subst \
-e 's;directory="logs";directory="%{l_prefix}/var/tomcat/log";' \
- $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf/server.xml
+ $RPM_BUILD_ROOT%{l_prefix}/etc/tomcat/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;' \
@@ -120,19 +123,14 @@
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.tomcat} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
- # locate conf directory through /etc
- ln -s \
- %{l_prefix}/var/tomcat/conf \
- $RPM_BUILD_ROOT%{l_prefix}/etc/tomcat
-
# determine package files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%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' \
- '%config %attr(644,%{l_rusr},%{l_rgrp})
%{l_prefix}/var/tomcat/conf/*'
+ '%dir %attr(755,%{l_rusr},%{l_rgrp}) %{l_prefix}/etc/tomcat' \
+ '%config %attr(644,%{l_rusr},%{l_rgrp}) %{l_prefix}/etc/tomcat/*'
%files -f files
@@ -154,7 +152,6 @@
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
exit 0
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
