# TODO
-# - spec vs filename
+# - packages for *.renametojar files (-cgi and -ssi in server/lib)
#
# Conditional build:
-%bcond_with binary # build from binary source
%bcond_without javadoc # skip building javadocs
#
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: apache-tomcat
-Version: 5.5.23
+Version: 5.5.27
Release: 0.1
License: Apache
Group: Development/Languages/Java
Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{name}-%{version}-src.tar.gz
-# Source0-md5: 362d1d8b15dc09882440dcab8c592dd7
-Source1: jakarta-tomcat.init
+# Source0-md5: eb3f196013550b9b1684e4ff18593a8e
+Source1: %{name}.init
+Source2: %{name}.sysconfig
+Source10: %{name}-context-ROOT.xml
+Source11: %{name}-context-balancer.xml
+Source12: %{name}-context-jsp-examples.xml
+Source13: %{name}-context-tomcat-docs.xml
+Source14: %{name}-context-webdav.xml
Patch0: %{name}-skip-servletapi.patch
Patch1: %{name}-nsis.patch
Patch2: %{name}-native.patch
Patch3: %{name}-skip-jdt.patch
Patch4: %{name}-no-connectors.patch
+Patch5: %{name}-dbcp.patch
+# this patch is needed for struts >= 1.3
+Patch6: %{name}-struts.patch
URL: http://tomcat.apache.org/
BuildRequires: ant >= 1.5.3
BuildRequires: ant-trax
BuildRequires: eclipse-jdt
BuildRequires: jaas
-BuildRequires: jakarta-commons-beanutils >= 1.7
-BuildRequires: jakarta-commons-collections >= 0:3.1
-BuildRequires: jakarta-commons-collections-source >= 0:3.1
-BuildRequires: jakarta-commons-daemon >= 1.0
-BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
-BuildRequires: jakarta-commons-dbcp-source >= 0:1.2.1
-BuildRequires: jakarta-commons-digester >= 0:1.7
-BuildRequires: jakarta-commons-el >= 0:1.0
-BuildRequires: jakarta-commons-fileupload >= 0:1.0
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: jakarta-commons-launcher >= 0:0.9
-BuildRequires: jakarta-commons-logging >= 0:1.0.4
-BuildRequires: jakarta-commons-modeler >= 2.0
-BuildRequires: jakarta-commons-pool >= 0:1.2
-BuildRequires: jakarta-commons-pool-source >= 0:1.2
+BuildRequires: java-commons-httpclient
BuildRequires: jakarta-regexp >= 0:1.3
-BuildRequires: jakarta-servletapi5
-#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
+BuildRequires: java-commons-daemon >= 1.0
+BuildRequires: java-commons-dbcp >= 0:1.2.1
+BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.2.1
+BuildRequires: java-commons-digester >= 0:1.7
+BuildRequires: java-commons-el >= 0:1.0
+BuildRequires: java-commons-fileupload >= 0:1.0
+BuildRequires: java-commons-io >= 1.4
+BuildRequires: java-commons-launcher >= 0:0.9
+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}
BuildRequires: javamail >= 0:1.3.1
BuildRequires: jaxp_parser_impl >= 0:2.7.1
BuildRequires: jdbc-stdext >= 0:2.0
BuildRequires: jdk >= 1.5
+BuildRequires: jmx
BuildRequires: jndi >= 0:1.2.1
BuildRequires: jpackage-utils
BuildRequires: jsse >= 0:1.0.3
BuildRequires: jta >= 0:1.0.1
BuildRequires: junit >= 0:3.8.1
BuildRequires: logging-log4j
-#BuildRequires: mx4j >= 0:3.0.1
-BuildRequires: mx4j >= 1.1.1
BuildRequires: puretls
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: xerces-j >= 0:2.7.1
Requires(pre): /usr/sbin/useradd
Requires: jaas
#Requires: jaf >= 1.0.1
-Requires: jakarta-commons-beanutils
-Requires: jakarta-commons-collections
-Requires: jakarta-commons-digester
-Requires: jakarta-commons-fileupload
-Requires: jakarta-commons-logging
Requires: jakarta-regexp
-Requires: jakarta-servletapi >= 4
+#Requires: java-commons-beanutils
+#Requires: java-commons-collections
+#Requires: java-commons-dbcp-tomcat5
+#Requires: java-commons-digester
+Requires: java-commons-el
+#Requires: java-commons-fileupload
+#Requires: java-commons-logging
+Requires: java-servletapi5 = %{version}
Requires: javamail >= 1.2
Requires: jaxp_parser_impl
Requires: jdbc-stdext >= 2.0
Requires: jre >= 1.2
Requires: jsse >= 1.0.2
Requires: jta >= 1.0.1
-Requires: mx4j >= 1.1.1
Requires: rc-scripts
Requires: xml-commons
Provides: group(http)
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _tomcatdir %{_libdir}/tomcat
+%define _tomcatdir %{_datadir}/tomcat
%define _logdir %{_var}/log
%define _vardir %{_var}/lib/tomcat
+%define _sysconfdir /etc/tomcat
%description
Tomcat is the servlet container that is used in the official Reference
%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
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
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
# servletapi built from jakarta-servletapi5.spec
rm -rf servletapi
%build
TOPDIR=$(pwd)
-mkdir -p tomcat-deps
-> tomcat-deps/tomcat-dbcp.jar
-
%if 0
# build jasper javadocs
cd jasper
CLASSPATH=$(build-classpath xml-commons-apis)
+# building jasper needs eclipse classes
cat > build.properties <<EOF
-ant.jar=$(build-classpath ant)
-servlet-api.jar=$(build-classpath servlet-api)
-jsp-api.jar=$(build-classpath jsp-api)
+ant.jar=$(find-jar ant)
+servlet-api.jar=$(find-jar servlet-api)
+jsp-api.jar=$(find-jar jsp-api)
tools.jar=%{java_home}/lib/tools.jar
-xercesImpl.jar=$(build-classpath jaxp_parser_impl)
-xmlParserAPIs.jar=$(build-classpath xml-commons-apis)
-commons-collections.jar=$(build-classpath commons-collections)
-commons-logging.jar=$(build-classpath commons-logging)
-commons-daemon.jar=$(build-classpath commons-daemon)
-junit.jar=$(build-classpath junit)
-commons-el.jar=$(build-classpath commons-el)
+xercesImpl.jar=$(find-jar jaxp_parser_impl)
+xmlParserAPIs.jar=$(find-jar xml-commons-apis)
+commons-collections.jar=$(find-jar commons-collections)
+commons-logging.jar=$(find-jar commons-logging)
+commons-daemon.jar=$(find-jar commons-daemon)
+junit.jar=$(find-jar junit)
+commons-el.jar=$(find-jar commons-el)
EOF
-# building jasper needs eclipse classes
#%ant dist
%if %{with javadoc}
# build tomcat 5.5
cat > build.properties <<EOF
-commons-beanutils.jar=$(build-classpath commons-beanutils)
-commons-launcher.jar=$(build-classpath commons-launcher)
-commons-daemon.jar=$(build-classpath commons-daemon)
-commons-digester.jar=$(build-classpath commons-digester)
-commons-el.jar=$(build-classpath commons-el)
-commons-logging-api.jar=$(build-classpath commons-logging-api)
-commons-logging.jar=$(build-classpath commons-logging)
-commons-modeler.jar=$(build-classpath commons-modeler)
-xercesImpl.jar=$(build-classpath jaxp_parser_impl)
-xml-apis.jar=$(build-classpath xml-commons-apis)
-jdt.jar=$(build-classpath org.eclipse.jdt.core)
+commons-beanutils.jar=$(find-jar commons-beanutils-core)
+commons-launcher.jar=$(find-jar commons-launcher)
+commons-daemon.jar=$(find-jar commons-daemon)
+commons-digester.jar=$(find-jar commons-digester)
+commons-el.jar=$(find-jar commons-el)
+commons-logging-api.jar=$(find-jar commons-logging-api)
+commons-logging.jar=$(find-jar commons-logging)
+commons-modeler.jar=$(find-jar commons-modeler)
+xercesImpl.jar=$(find-jar jaxp_parser_impl)
+xml-apis.jar=$(find-jar xml-commons-apis)
+jdt.jar=$(find-jar org.eclipse.jdt.core)
jasper-compiler-jdt.home=$TOPDIR/tomcat-deps
-commons-httpclient.jar=$(build-classpath commons-httpclient)
-commons-collections.jar=$(build-classpath commons-collections)
-commons-fileupload.jar=$(build-classpath commons-fileupload)
-jmx.jar=$(build-classpath jre/jmx)
-jmx-tools.jar=$(build-classpath jre/jmx)
-junit.jar=$(build-classpath junit)
-struts.jar=$(build-classpath struts)
-jcert.jar=$(build-classpath java/jcert)
-jnet.jar=$(build-classpath java/jnet)
-jsse.jar=$(build-classpath java/jsse)
-jta.jar=$(build-classpath jta)
-puretls.jar=$(build-classpath puretls)
-servlet-api.jar=$(build-classpath servlet-api)
+commons-httpclient.jar=$(find-jar commons-httpclient)
+commons-collections.jar=$(find-jar commons-collections)
+commons-fileupload.jar=$(find-jar commons-fileupload)
+commons-io.jar=$(find-jar commons-io)
+jmx.jar=$(find-jar jmx)
+jmx-tools.jar=$(find-jar jmx)
+junit.jar=$(find-jar junit)
+struts.jar=$(find-jar struts-core)
+struts-core.jar=$(find-jar struts-core)
+struts-taglib.jar=$(find-jar struts-taglib)
+jcert.jar=$(find-jar jcert)
+jnet.jar=$(find-jar jnet)
+jsse.jar=$(find-jar jsse)
+jta.jar=$(find-jar jta)
+puretls.jar=$(find-jar puretls)
+servlet-api.jar=$(find-jar servlet-api)
servletapi.build.notrequired=true
-jsp-api.jar=$(build-classpath jsp-api)
+jsp-api.jar=$(find-jar jsp-api)
jspapi.build.notrequired=true
-log4j.jar=$(build-classpath log4j)
-# source is needed because source is copied modified and recompiled as tomcat jar
-# see <target name="-build-tomcat-dbcp"> in build/build.xml
-commons-collections.home=%{_prefix}/src/jakarta-commons-collections-3.1
-commons-pool.home=%{_prefix}/src/jakarta-commons-pool-1.3
-commons-dbcp.home=%{_prefix}/src/jakarta-commons-dbcp-1.2.1
-tomcat-dbcp.home=$TOPDIR/tomcat-deps
-# err, it compiles three above and then appends to the jar, so the file should exist
-tomcat-dbcp.jar=$TOPDIR/tomcat-deps/tomcat-dbcp.jar
+log4j.jar=$(find-jar log4j)
+tomcat-dbcp.jar=$(find-jar commons-dbcp-tomcat5)
+struts.lib=%{_datadir}/java-struts
EOF
%ant \
%install
rm -rf $RPM_BUILD_ROOT
+cd build/build
+TOMCATDIR=$RPM_BUILD_ROOT%{_tomcatdir}
+CATALINADIR=$RPM_BUILD_ROOT/var/lib/tomcat
+
+# we don't need dos scripts
+rm -f bin/*.bat
-DEST=$RPM_BUILD_ROOT%{_tomcatdir}
+randpw=$(echo $RANDOM$$ | md5sum | cut -c 1-15)
+%{__sed} -i -e "s:SHUTDOWN:${randpw}:" conf/{server,server-minimal}.xml
-install -d $DEST/bin \
- $DEST/common/{lib,classes,endorsed} \
- $DEST/server/{lib,classes} \
- $DEST/webapps \
- $RPM_BUILD_ROOT%{_sysconfdir}/tomcat \
+install -d $TOMCATDIR/bin \
+ $TOMCATDIR/common/{lib,classes,endorsed} \
+ $TOMCATDIR/server/{lib,classes} \
+ $TOMCATDIR/webapps \
$RPM_BUILD_ROOT%{_logdir}/tomcat \
+ $RPM_BUILD_ROOT%{_vardir}/webapps \
$RPM_BUILD_ROOT%{_vardir}/work \
+ $RPM_BUILD_ROOT%{_vardir}/conf \
+ $RPM_BUILD_ROOT/etc/sysconfig \
$RPM_BUILD_ROOT/etc/rc.d/init.d
-install build/bin/*.sh $DEST/bin
-install build/bin/bootstrap*.jar $DEST/bin
-install build/bin/tomcat*.jar $DEST/bin
-install build/common/lib/naming-*.jar $DEST/common/lib
-install build/common/lib/jasper-*.jar $DEST/common/lib
-install build/conf/* $RPM_BUILD_ROOT%{_sysconfdir}/tomcat
-install build/server/lib/catalina*.jar $DEST/server/lib
-install build/server/lib/servlets*.jar $DEST/server/lib
-install build/server/lib/tomcat*.jar $DEST/server/lib
-install build/server/lib/servlets-cgi.renametojar $DEST/server/lib/servlets-cgi.jar
-install build/server/lib/servlets-ssi.renametojar $DEST/server/lib/servlets-ssi.jar
-cp -rf build/server/webapps $DEST/server
-cp -rf build/webapps $DEST
-cp -rf build/shared $DEST
-cp -rf build/temp $DEST
-
-ln -sf %{_logdir}/tomcat $DEST/logs
-ln -sf %{_vardir}/work $DEST/work
-ln -sf %{_sysconfdir}/tomcat $DEST/conf
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat
+
+cp -pR conf/* $CATALINADIR/conf
+install %{SOURCE10} $CATALINADIR/conf/Catalina/localhost/ROOT.xml
+install %{SOURCE11} $CATALINADIR/conf/Catalina/localhost/balancer.xml
+install %{SOURCE12} $CATALINADIR/conf/Catalina/localhost/jsp-examples.xml
+install %{SOURCE13} $CATALINADIR/conf/Catalina/localhost/tomcat-docs.xml
+install %{SOURCE14} $CATALINADIR/conf/Catalina/localhost/webdav.xml
+cp -HR bin common server $TOMCATDIR
+
+cp -rf server/webapps $TOMCATDIR/server
+cp -rf webapps $TOMCATDIR
+cp -rf shared $TOMCATDIR
+cp -rf temp $TOMCATDIR
+
+ln -sf %{_logdir}/tomcat $CATALINADIR/logs
+ln -sf %{_vardir}/work $TOMCATDIR/work
+ln -sf %{_vardir}/conf $TOMCATDIR/conf
+ln -sf %{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}
# symlinks instead of copies
-ln -sf %{_javadir}/commons-daemon.jar $DEST/bin
-
-ln -sf %{_javadir}/activation.jar $DEST/common/lib
-ln -sf %{_javadir}/ant.jar $DEST/common/lib
-ln -sf %{_javadir}/commons-collections.jar $DEST/common/lib
-ln -sf %{_javadir}/commons-dbcp.jar $DEST/common/lib
-ln -sf %{_javadir}/commons-logging-api.jar $DEST/common/lib
-ln -sf %{_javadir}/commons-pool.jar $DEST/common/lib
-ln -sf %{_javadir}/servlet.jar $DEST/common/lib
-ln -sf %{_javadir}/servlet.jar $DEST/common/lib/servletapi4.jar
-ln -sf %{_javadir}/jdbc-stdext.jar $DEST/common/lib/jdbc2_0-stdext.jar
-ln -sf %{_javadir}/jdbc-stdext.jar $DEST/common/lib/jdbc-stdext-2.0.jar
-ln -sf %{_javadir}/jmxri.jar $DEST/common/lib
-ln -sf %{_javadir}/jndi.jar $DEST/common/lib
-ln -sf %{_javadir}/jta.jar $DEST/common/lib
-ln -sf %{_javadir}/mail.jar $DEST/common/lib
-ln -sf %{_javadir}/jsse.jar $DEST/common/lib
-ln -sf %{_javadir}/junit.jar $DEST/common/lib
-
-ln -sf %{_javadir}/mailapi.jar $DEST/common/lib
-ln -sf %{_javadir}/pop3.jar $DEST/common/lib
-ln -sf %{_javadir}/pop3.jar $DEST/common/lib/pop.jar
-ln -sf %{_javadir}/smtp.jar $DEST/common/lib
-ln -sf %{_javadir}/imap.jar $DEST/common/lib
-
-ln -sf %{_javadir}/commons-beanutils.jar $DEST/server/lib
-ln -sf %{_javadir}/commons-digester.jar $DEST/server/lib
-ln -sf %{_javadir}/commons-fileupload.jar $DEST/server/lib
-ln -sf %{_javadir}/commons-logging.jar $DEST/server/lib
-ln -sf %{_javadir}/commons-modeler.jar $DEST/server/lib
-ln -sf %{_javadir}/jaas.jar $DEST/server/lib/jaas.jar
-ln -sf %{_javadir}/mx4j-jmx.jar $DEST/server/lib
-ln -sf %{_javadir}/regexp.jar $DEST/server/lib
-ln -sf %{_javadir}/regexp.jar $DEST/server/lib/jakarta-regexp-1.2.jar
-ln -sf %{_javadir}/regexp.jar $DEST/server/lib/regexp-1.2.jar
-
-ln -sf %{_javadir}/jaxp_parser_impl.jar $DEST/common/endorsed
-ln -sf %{_javadir}/xml-commons-apis.jar $DEST/common/endorsed
-
-ln -sf %{_javadir}/struts.jar $DEST/server/webapps/admin/WEB-INF/lib
+ln -sf $(find-jar commons-el) $TOMCATDIR/common/lib/commons-el.jar
+ln -sf $(find-jar jakarta-commons-dbcp-tomcat5) $TOMCATDIR/common/lib/jakarta-commons-dbcp-tomcat5.jar
+ln -sf $(find-jar servlet-api) $TOMCATDIR/common/lib/servlet-api.jar
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
+ln -sf $(find-jar commons-modeler) $TOMCATDIR/server/lib/commons-modeler.jar
+
+%if 0
+# do not make these symlinks as ant didn't do
+ln -sf $(find-jar commons-daemon) $TOMCATDIR/bin/commons-daemon.jar
+ln -sf $(find-jar activation) $TOMCATDIR/common/lib/activation.jar
+ln -sf $(find-jar ant) $TOMCATDIR/common/lib/ant.jar
+ln -sf $(find-jar commons-collections) $TOMCATDIR/common/lib/commons-collections.jar
+ln -sf $(find-jar commons-dbcp) $TOMCATDIR/common/lib/commons-dbcp.jar
+ln -sf $(find-jar commons-logging-api) $TOMCATDIR/common/lib/commons-logging-api.jar
+ln -sf $(find-jar commons-pool) $TOMCATDIR/common/lib/commons-pool.jar
+ln -sf $(find-jar servlet) $TOMCATDIR/common/lib/servlet.jar
+ln -sf $(find-jar servlet) $TOMCATDIR/common/lib/servletapi4.jar
+ln -sf $(find-jar jdbc-stdext) $TOMCATDIR/common/lib/jdbc-stdext.jar
+ln -sf jdbc-stdext.jar $TOMCATDIR/common/lib/jdbc2_0-stdext.jar
+ln -sf jdbc-stdext.jar $TOMCATDIR/common/lib/jdbc-stdext-2.0.jar
+ln -sf $(find-jar jmxri) $TOMCATDIR/common/lib/jmxri.jar
+ln -sf $(find-jar jndi) $TOMCATDIR/common/lib/jndi.jar
+ln -sf $(find-jar jta) $TOMCATDIR/common/lib/jta.jar
+ln -sf $(find-jar mail) $TOMCATDIR/common/lib/mail.jar
+ln -sf $(find-jar jsse) $TOMCATDIR/common/lib/jsse.jar
+ln -sf $(find-jar junit) $TOMCATDIR/common/lib/junit.jar
+ln -sf $(find-jar mailapi) $TOMCATDIR/common/lib/mailapi.jar
+ln -sf $(find-jar pop3) $TOMCATDIR/common/lib/pop3.jar
+ln -sf pop3.jar $TOMCATDIR/common/lib/pop.jar
+ln -sf $(find-jar smtp) $TOMCATDIR/common/lib/smtp.jar
+ln -sf $(find-jar imap) $TOMCATDIR/common/lib/imap.jar
+ln -sf $(find-jar commons-beanutils) $TOMCATDIR/server/lib/commons-beanutils.jar
+ln -sf $(find-jar commons-digester) $TOMCATDIR/server/lib/commons-digester.jar
+ln -sf $(find-jar commons-fileupload) $TOMCATDIR/server/lib/commons-fileupload.jar
+ln -sf $(find-jar commons-logging) $TOMCATDIR/server/lib/commons-logging.jar
+ln -sf $(find-jar jaas) $TOMCATDIR/server/lib/jaas.jar
+ln -sf $(find-jar regexp) $TOMCATDIR/server/lib/regexp.jar
+ln -sf $(find-jar regexp) $TOMCATDIR/server/lib/jakarta-regexp-1.2.jar
+ln -sf $(find-jar regexp) $TOMCATDIR/server/lib/regexp-1.2.jar
+%endif
+
+ln -sf $(find-jar jaxp_parser_impl) $TOMCATDIR/common/endorsed/jaxp_parser_impl.jar
+ln -sf $(find-jar xml-commons-apis) $TOMCATDIR/common/endorsed/xml-commons-apis.jar
+ln -sf $(find-jar struts-core) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/struts-core.jar
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc *.txt LICENSE
+%doc build/{RELEASE-NOTES,RUNNING.txt}
+%attr(754,root,root) /etc/rc.d/init.d/tomcat
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tomcat
+%{_sysconfdir}
%dir %{_tomcatdir}
+%dir %{_tomcatdir}/conf
%dir %{_tomcatdir}/bin
+%{_tomcatdir}/bin/catalina-tasks.xml
+%{_tomcatdir}/bin/jkstatus-tasks.xml
+%{_tomcatdir}/bin/jmxaccessor-tasks.xml
%attr(755,root,root) %{_tomcatdir}/bin/*.sh
%{_tomcatdir}/bin/*.jar
%dir %{_tomcatdir}/common
%dir %{_tomcatdir}/common/classes
%dir %{_tomcatdir}/common/endorsed
+%dir %{_tomcatdir}/common/i18n
%{_tomcatdir}/common/endorsed/*.jar
+%{_tomcatdir}/common/i18n/tomcat-i18n-en.jar
+%lang(es) %{_tomcatdir}/common/i18n/tomcat-i18n-es.jar
+%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
%{_tomcatdir}/work
%{_tomcatdir}/shared
%{_tomcatdir}/temp
-# tomcat wants to regenerate tomcat-users.xml
-%attr(775,root,http) %dir %{_sysconfdir}/tomcat
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tomcat/*
-%attr(754,root,root) /etc/rc.d/init.d/tomcat
%dir %{_vardir}
-%attr(1730,root,http) %dir %{_vardir}/work
-%attr(1730,root,http) %dir %{_logdir}/tomcat
+# 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(775,root,http) %{_vardir}/webapps
+%dir %attr(775,root,http) %{_logdir}/tomcat
+%{_vardir}/logs
+%if 0
%files doc
%defattr(644,root,root,755)
%doc catalina/docs/*
+%endif
projects / packages / apache-tomcat.git / blobdiff