- +x for some dirs

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index c12dc060f34bf77d4353359b1f1dedcfc5d3e19e..34aad415320d37609597e1b2b99a7b3f10f01d47 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -9,7 +9,7 @@ Summary:        Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Summary(pl.UTF-8):     Silnik Servlet/JSP Apache będący wzorcową implementacją API Servlet 2.4/JSP 2.0
 Name:          tomcat
 Version:       5.5.27
-Release:       0.5
+Release:       0.6
 License:       Apache v2.0
 Group:         Networking/Daemons/Java
 Source0:       http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
@@ -195,6 +195,8 @@ servletów Apache Tomcat.
 
 # we don't need dos scripts
 rm -f container/catalina/src/bin/*.bat
+# or those
+rm -f container/catalina/src/bin/{startup,shutdown}.sh
 
 # causes file(1) rpm to abort, and not really neccessary file
 rm container/webapps/admin/images/Thumbs.db
@@ -293,6 +295,7 @@ cp -a shared $TOMCATDIR
 cp -a temp $CATALINADIR
 
 ln -sf %{_logdir}/tomcat $CATALINADIR/logs
+ln -sf %{_logdir}/tomcat $TOMCATDIR/logs
 ln -sf %{_vardir}/work $TOMCATDIR/work
 ln -sf %{_vardir}/conf $TOMCATDIR/conf
 ln -sf %{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}
@@ -422,11 +425,14 @@ fi
 %config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/webdav.xml
 %{_tomcatdir}/webapps/webdav
 
+%{_tomcatdir}/logs
 %{_tomcatdir}/work
 %{_tomcatdir}/shared
 %dir %{_vardir}
-%dir %{_vardir}/conf
-%dir %{_vardir}/conf/Catalina
+# these directory has to be writeable because /admin need to modify config
+# files and create temporary files
+%dir %attr(775,root,tomcat) %{_vardir}/conf
+%dir %attr(775,root,tomcat) %{_vardir}/conf/Catalina
 %dir %{_vardir}/conf/Catalina/localhost
 # tomcat config has to be writeable because of tomcat-users.xml file and Catalina dir
 %config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/MANIFEST.MF