- fixed logdir path in %%files

[packages/apache-tomcat.git] / apache-tomcat.spec

diff --git a/apache-tomcat.spec b/apache-tomcat.spec
index 2d3ce5c798f13b2795adec200ebd93cc52397778..29adcb316cc883240e3b94a11556f618073fbc5f 100644 (file)
--- a/apache-tomcat.spec
+++ b/apache-tomcat.spec
@@ -27,10 +27,10 @@ BuildRequires:      ant >= 1.5.3
 BuildRequires: ant-trax
 BuildRequires: eclipse-jdt
 BuildRequires: jaas
-BuildRequires: jakarta-commons-httpclient
+BuildRequires: java-commons-httpclient
 BuildRequires: jakarta-regexp >= 0:1.3
-#BuildRequires:        jakarta-struts >= 0:1.2.7
-BuildRequires: jakarta-struts >= 1.0.2
+#BuildRequires:        java-struts >= 0:1.2.7
+BuildRequires: java-struts >= 1.0.2
 BuildRequires: java-commons-beanutils >= 1.7
 BuildRequires: java-commons-collections >= 0:3.1
 BuildRequires: java-commons-collections-tomcat5 >= 0:3.1
@@ -46,7 +46,7 @@ BuildRequires:        java-commons-logging >= 0:1.0.4
 BuildRequires: java-commons-modeler >= 2.0
 BuildRequires: java-commons-pool >= 0:1.2
 BuildRequires: java-commons-pool-tomcat5 >= 0:1.2
-BuildRequires: java-servletapi5 = %{version}-%{release}
+BuildRequires: java-servletapi5 = %{version}
 BuildRequires: javamail >= 0:1.3.1
 BuildRequires: jaxp_parser_impl >= 0:2.7.1
 BuildRequires: jdbc-stdext >= 0:2.0
@@ -81,7 +81,7 @@ Requires:     jakarta-regexp
 Requires:      java-commons-el
 #Requires:     java-commons-fileupload
 #Requires:     java-commons-logging
-Requires:      java-servletapi5 = %{version}-%{release}
+Requires:      java-servletapi5 = %{version}
 Requires:      javamail >= 1.2
 Requires:      jaxp_parser_impl
 Requires:      jdbc-stdext >= 2.0
@@ -121,7 +121,7 @@ Community Process.
 
 %package doc
 Summary:       The Apache Tomcat Servlet/JSP Container documentation
-Summary(pl.UTF-8):     Dokumentacja do Tomcata - kontekera Servlet/JSP
+Summary(pl.UTF-8):     Dokumentacja do Tomcata - kontenera Servlet/JSP
 Group:         Development/Languages/Java
 Obsoletes:     jakarta-tomcat-doc
 
@@ -129,7 +129,7 @@ Obsoletes:  jakarta-tomcat-doc
 The Tomcat Servlet/JSP Container documentation.
 
 %description doc -l pl.UTF-8
-Dokumentacja do Tomcata - kontekera Servlet/JSP.
+Dokumentacja do Tomcata - kontenera Servlet/JSP.
 
 %prep
 %setup -q -n %{name}-%{version}-src
@@ -214,7 +214,7 @@ jsp-api.jar=$(find-jar jsp-api)
 jspapi.build.notrequired=true
 log4j.jar=$(find-jar log4j)
 tomcat-dbcp.jar=$(find-jar commons-dbcp-tomcat5)
-struts.lib=%{_datadir}/jakarta-struts
+struts.lib=%{_datadir}/java-struts
 EOF
 
 %ant \
@@ -236,14 +236,15 @@ install -d $TOMCATDIR/bin \
            $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
 
-cp -pR conf/* $RPM_BUILD_ROOT%{_sysconfdir}
+cp -pR conf/* $CATALINADIR/conf
 cp -HR bin common server $TOMCATDIR
 
 cp -rf server/webapps $TOMCATDIR/server
@@ -251,9 +252,10 @@ cp -rf webapps $TOMCATDIR
 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
@@ -327,11 +329,10 @@ fi
 %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
@@ -348,8 +349,6 @@ fi
 %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
 %{_tomcatdir}/server/lib
@@ -359,8 +358,13 @@ fi
 %{_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) %{_logdir}/tomcat
+%dir %attr(775,root,http) %{_vardir}/webapps
+%dir %attr(775,root,http) %{_logdir}/tomcat
+%{_vardir}/logs
 
 %if 0
 %files doc