|
|
@@ -57,7 +57,6 @@ Conflicts: tomcat
|
|
|
|
|
|
%build
|
|
|
|
|
|
-
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
@@ -73,15 +72,15 @@ Conflicts: tomcat
|
|
|
# unpack vendor distribution and relocate to final location
|
|
|
%{l_tar} -cf - \
|
|
|
bin/*.sh bin/*.jar common conf server shared webapps |\
|
|
|
- ( umask 022; \
|
|
|
- cd $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/; \
|
|
|
- %{l_tar} -xf - )
|
|
|
+ ( umask 022
|
|
|
+ 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
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/var/tomcat/conf
|
|
|
|
|
|
- # provide symlink for ${jkHome}/work and {$jkHome}/conf
|
|
|
+ # provide symlink for ${jkHome}/work and ${jkHome}/conf
|
|
|
ln -s \
|
|
|
%{l_prefix}/var/tomcat/work \
|
|
|
$RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat/work
|
|
|
@@ -123,10 +122,10 @@ Conflicts: tomcat
|
|
|
|
|
|
%preun
|
|
|
if [ $1 -eq 0 ]; then
|
|
|
- # remove log files
|
|
|
- rm -f $RPM_INSTALL_PREFIX/var/tomcat/log/*
|
|
|
+ # 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
|
|
|
+ rm -f $RPM_INSTALL_PREFIX/var/tomcat/conf/jk2.properties.save
|
|
|
fi
|
|
|
|