SPECS: apache-tomcat.spec - install directories writable for tomcat into /v...

[pawelz]

Author: pawelz                       Date: Fri Jan 23 20:16:17 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- install directories writable for tomcat into /var/lib
- now /etc/tomcat and /usr/share/tomcat are ro

---- Files affected:
SPECS:
   apache-tomcat.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: SPECS/apache-tomcat.spec
diff -u SPECS/apache-tomcat.spec:1.66 SPECS/apache-tomcat.spec:1.67
--- SPECS/apache-tomcat.spec:1.66	Fri Jan 23 20:11:40 2009
+++ SPECS/apache-tomcat.spec	Fri Jan 23 21:16:11 2009
@@ -15,7 +15,6 @@
 Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{name}-%{version}-src.tar.gz
 # Source0-md5:	eb3f196013550b9b1684e4ff18593a8e
 Source1:	%{name}.init
-Source2:	%{name}.sysconfig
 Patch0:		%{name}-skip-servletapi.patch
 Patch1:		%{name}-nsis.patch
 Patch2:		%{name}-native.patch
@@ -238,15 +237,15 @@
 	    $TOMCATDIR/common/{lib,classes,endorsed} \
 	    $TOMCATDIR/server/{lib,classes} \
 	    $TOMCATDIR/webapps \
-	    $RPM_BUILD_ROOT%{_sysconfdir} \
 	    $RPM_BUILD_ROOT%{_logdir}/tomcat \
+	    $RPM_BUILD_ROOT%{_vardir}/webapps \
 	    $RPM_BUILD_ROOT%{_vardir}/work \
+	    $RPM_BUILD_ROOT%{_vardir}/conf \
 	    $RPM_BUILD_ROOT/etc/rc.d/init.d
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat
 
-cp -pR conf/* $RPM_BUILD_ROOT%{_sysconfdir}
+cp -pR conf/* $CATALINADIR/conf
 cp -HR bin common server $TOMCATDIR
 
 cp -rf server/webapps $TOMCATDIR/server
@@ -254,9 +253,10 @@
 cp -rf shared $TOMCATDIR
 cp -rf temp $TOMCATDIR
 
-ln -sf %{_logdir}/tomcat $TOMCATDIR/logs
+ln -sf %{_logdir}/tomcat $CATALINADIR/logs
 ln -sf %{_vardir}/work $TOMCATDIR/work
-ln -sf %{_sysconfdir} $TOMCATDIR/conf
+ln -sf %{_vardir}/conf $TOMCATDIR/conf
+ln -sf %{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 # symlinks instead of copies
 ln -sf $(find-jar commons-el) $TOMCATDIR/common/lib/commons-el.jar
@@ -330,11 +330,10 @@
 %files
 %defattr(644,root,root,755)
 %doc build/{RELEASE-NOTES,RUNNING.txt}
-# tomcat wants to regenerate tomcat-users.xml
-%dir %attr(775,root,http) %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %attr(754,root,root) /etc/rc.d/init.d/tomcat
+%{_sysconfdir}
 %dir %{_tomcatdir}
+%dir %{_tomcatdir}/conf
 %dir %{_tomcatdir}/bin
 %{_tomcatdir}/bin/catalina-tasks.xml
 %{_tomcatdir}/bin/jkstatus-tasks.xml
@@ -351,7 +350,6 @@
 %lang(fr) %{_tomcatdir}/common/i18n/tomcat-i18n-fr.jar
 %lang(ja) %{_tomcatdir}/common/i18n/tomcat-i18n-ja.jar
 %{_tomcatdir}/common/lib
-%{_tomcatdir}/conf
 %{_tomcatdir}/logs
 %dir %{_tomcatdir}/server
 %dir %{_tomcatdir}/server/classes
@@ -362,7 +360,11 @@
 %{_tomcatdir}/shared
 %{_tomcatdir}/temp
 %dir %{_vardir}
+# tomcat config has to be writeable because of tomacta-users.xml file and
+# Catalina dir
+%config(noreplace) %attr(775,root,http) %verify(not md5 mtime size) %{_vardir}/conf
 %dir %attr(1730,root,http) %{_vardir}/work
+%dir %attr(1730,root,http) %{_vardir}/webapps
 %dir %attr(1730,root,http) %{_logdir}/tomcat
 
 %if 0
@@ -377,8 +379,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.66  2009/01/23 19:11:40  pawelz
-- added sysconfig file
+Revision 1.67  2009/01/23 20:16:11  pawelz
+- install directories writable for tomcat into /var/lib
+- now /etc/tomcat and /usr/share/tomcat are ro
 
 Revision 1.65  2009/01/23 18:19:56  pawelz
 - once again: Require exact version, but not release of java-servletapi5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-tomcat.spec?r1=1.66&r2=1.67&f=u