X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tomcat.spec;h=2dff62b8a1464113b751dca63a496018be335621;hb=f952cac26b29edb9cde774f183cc0b13c203cd7c;hp=7ef39aa98b3f1b2901677724ed31cf3d2117ac43;hpb=73014acb78478ad309238bdeb7792d40fac05324;p=packages%2Ftomcat.git

diff --git a/tomcat.spec b/tomcat.spec
index 7ef39aa..2dff62b 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,85 +1,51 @@
-# TODO
-# - packages for *.renametojar files (-cgi and -ssi in server/lib)
-#
+
 # Conditional build:
 %bcond_without	javadoc		# skip building javadocs
-%bcond_with	jta		# put jta jar into tomcat lib dir.
-%bcond_without	java_sun	# build with gcj (does not work)
-#
-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.27
-Release:	0.3
+%bcond_without	webservices	# skip building webservices
+
+%define		jspapiver	2.1
+%define		servletapiver	2.5
+
+%include	/usr/lib/rpm/macros.java
+Summary:	Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver} API
+Summary(pl.UTF-8):	Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
+Name:		tomcat
+Version:	6.0.29
+Release:	3.7
 License:	Apache v2.0
 Group:		Networking/Daemons/Java
-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
+Source0:	http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
+# Source0-md5:	260de5ae62f415b9c085c5aeed4ef24c
+Source1:	apache-%{name}.init
+Source2:	apache-%{name}.sysconfig
+Source3:	%{name}-build.properties
 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
-# WTF? Why is it needed? Is it related to struts version?
-Patch7:		%{name}-admin-struts.patch
+Source11:	%{name}-context-docs.xml
+Source12:	%{name}-context-manager.xml
+Source13:	%{name}-context-host-manager.xml
+Source14:	%{name}-context-examples.xml
+Patch0:		%{name}-build.xml.patch
+Patch1:		%{name}-extras.xml.patch
+Patch2:		server.xml-URIEncoding-utf8.patch
+Patch3:		%{name}-LDAPUserDatabase.patch
+Patch4:		%{name}-catalina.policy-javadir.patch
 URL:		http://tomcat.apache.org/
-%if %{with java_sun}
-BuildRequires:	java-sun >= 1.5
-BuildRequires:	java-sun-jre >= 1.5
-%else
-BuildRequires:	java-gcj-compat-devel
-# BuildRequires:	jsse >= 0:1.0.3
-%endif
 BuildRequires:	ant >= 1.5.3
 BuildRequires:	ant-trax
-BuildRequires:	eclipse-jdt
-BuildRequires:	jaas
-BuildRequires:	jakarta-regexp >= 0:1.3
-BuildRequires:	java-commons-beanutils >= 1.7
-BuildRequires:	java-commons-chain
-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-httpclient
-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
-%{?with_jta:BuildRequires:	java-jta >= 0:1.0.1}
-BuildRequires:	java-log4j
-BuildRequires:	java-puretls
-BuildRequires:	java-servletapi5 = %{version}
-#BuildRequires:	java-struts >= 0:1.2.7
-BuildRequires:	java-struts >= 1.0.2
-BuildRequires:	java-xerces >= 0:2.7.1
-BuildRequires:	java-xml-commons
-#BuildRequires:	java-xml-commons >= 1.3
-BuildRequires:	java-mail >= 0:1.3.1
-BuildRequires:	jaxp_parser_impl >= 0:2.7.1
-BuildRequires:	jdbc-stdext >= 0:2.0
-BuildRequires:	jmx
-BuildRequires:	jndi >= 0:1.2.1
+BuildRequires:	java-commons-dbcp-tomcat5 >= 0:1.1
+BuildRequires:	java-commons-pool-tomcat5
+BuildRequires:	java-eclipse-jdt >= 3.2
+%if %{with webservices}
+BuildRequires:	java(JSR109)
+BuildRequires:	java-geronimo-spec-jaxrpc
+%endif
+BuildRequires:	java-jdbc-mysql
+BuildRequires:	java-mail
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
-BuildRequires:	junit >= 0:3.8.1
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires(post,postun):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -87,31 +53,25 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	%{name}-jasper = %{version}-%{release}
-Requires:	jaas
-#Requires:	jaf >= 1.0.1
-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-commons-modeler
-Requires:	java-regexp
-Requires:	java-servletapi5 = %{version}
-Requires:	java-xml-commons
-Requires:	javamail >= 1.2
-Requires:	jaxp_parser_impl
-Requires:	jdbc-stdext >= 2.0
-Requires:	jndi >= 1.2.1
+Requires:	java(jaxp_parser_impl)
+Requires:	java(jndi) >= 1.2.1
+Requires:	java-%{name}-catalina = %{epoch}:%{version}-%{release}
+Requires:	java-%{name}-coyote = %{epoch}:%{version}-%{release}
+Requires:	java-%{name}-jasper = %{epoch}:%{version}-%{release}
+Requires:	java-commons-dbcp-tomcat5 >= 0:1.1
+Requires:	java-commons-pool-tomcat5
+Requires:	java-jdbc-mysql
+Requires:	java-mail
+Requires:	java-servletapi = %{epoch}:%{version}-%{release}
+Requires:	jpackage-utils
 Requires:	jre >= 1.2
-Requires:	jsse >= 1.0.2
-%{?with_jta:Requires:	jta >= 1.0.1}
+Requires:	jsvc
 Requires:	rc-scripts
+Suggests:	tomcat-native
+Provides:	group(servlet)
 Provides:	group(tomcat)
-Provides:	java-servlet-container
 Provides:	user(tomcat)
+Obsoletes:	apache-tomcat
 Obsoletes:	jakarta-tomcat
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -119,7 +79,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_tomcatdir	%{_datadir}/tomcat
 %define 	_logdir		%{_var}/log
 %define		_vardir		%{_var}/lib/tomcat
-%define		_sysconfdir	/etc/tomcat
+
+%define find_jar() %{expand:%%define jarfile {%(jar=$(find-jar %1); echo ${jar:-%%nil})}}%{?jarfile}%{!?jarfile:%{error:find-jar %1 failed}}%{nil}
 
 %description
 Tomcat is the servlet container that is used in the official Reference
@@ -138,246 +99,246 @@ wzorcową technologii Java Servlet i JavaServer Pages. Specyfikacje
 Java Servlet i JavaServer Pages są rozwijane przez Suna zgodnie z Java
 Community Process.
 
-%package doc
+%package webapp-docs
 Summary:	The Apache Tomcat Servlet/JSP Container documentation
 Summary(pl.UTF-8):	Dokumentacja do Tomcata - kontenera Servlet/JSP
 Group:		Documentation
+Obsoletes:	apache-tomcat-doc
 Obsoletes:	jakarta-tomcat-doc
+Obsoletes:	tomcat-doc
 
-%description doc
+%description webapp-docs
 The Tomcat Servlet/JSP Container documentation.
 
-%description doc -l pl.UTF-8
+%description webapp-docs -l pl.UTF-8
 Dokumentacja do Tomcata - kontenera Servlet/JSP.
 
-%package admin
-Summary:	Apache Tomcat`s Administration Web Application
-Summary(pl.UTF-8):	Panel Administracyjny dla Apache Tomcat
+%package webapp-manager
+Summary:	The Apache Tomcat Servlet/JSP application manager
+Summary(pl.UTF-8):	Zarządca aplikacji w Tomcacie
+Group:		Networking/Daemons/Java/Servlets
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description webapp-manager
+The Apache Tomcat Servlet/JSP application manager.
+
+%description webapp-manager -l pl.UTF-8
+Zarządca aplikacji w Tomcacie.
+
+%package webapp-host-manager
+Summary:	The Apache Tomcat Servlet/JSP virtual hosts manager
+Summary(pl.UTF-8):	Zarządca wirtualnych hostów w Tomcacie
 Group:		Networking/Daemons/Java/Servlets
-Requires:	java-commons-chain
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Obsoletes:	tomcat-admin
+
+%description webapp-host-manager
+The Apache Tomcat Servlet/JSP virtual hosts manager.
 
-%description admin
-Administration Web Application for Apache Tomcat.
+%description webapp-host-manager -l pl.UTF-8
+Zarządca wirtualnych hostów w Tomcacie.
+
+%package webapp-examples
+Summary:	The Apache Tomcat Servlet/JSP example applications
+Summary(pl.UTF-8):	Przykładowe aplikacje dla Tomcata
+Group:		Networking/Daemons/Java/Servlets
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description webapp-examples
+The Apache Tomcat Servlet/JSP example applications.
+
+%description webapp-examples -l pl.UTF-8
+Przykładowe aplikacje dla Tomcata.
+
+%package webservices
+Summary:	Web Services support (JSR 109)
+Group:		Libraries/Java
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	java(JSR109)
+Requires:	java-geronimo-spec-jaxrpc
 
-%description admin -l pl.UTF-8
-Panel Administracyjny dla Apache Tomcat.
+%description webservices
+Factories for JSR 109 which may be used to resolve web services
+references.
 
-%package jasper
+%package -n java-tomcat-catalina
+Summary:	Tomcat's servlet container
+Group:		Libraries/Java
+Requires:	jpackage-utils
+
+%description -n java-tomcat-catalina
+Catalina is Tomcat's servlet container. Catalina implements Sun
+Microsystems' specifications for servlet and JavaServer Pages (JSP).
+
+%package -n java-tomcat-coyote
+Summary:	Tomcat HTTP connector
+Group:		Libraries/Java
+Requires:	jpackage-utils
+
+%description -n java-tomcat-coyote
+Coyote is Tomcat's HTTP Connector component that supports the HTTP 1.1
+protocol for the web server or application container. Coyote listens
+for incoming connections on a specific TCP port on the server and
+forwards the request to the Tomcat Engine to process the request and
+send back a response to the requesting client.
+
+%package -n java-tomcat-jasper
 Summary:	JSP compiler
 Summary(pl.UTF-8):	Kompilator JSP
 Group:		Libraries/Java
+Requires:	java-eclipse-jdt >= 3.2
 Requires:	jpackage-utils
+Obsoletes:	apache-tomcat-jasper
+Obsoletes:	tomcat-jasper
 
-%description jasper
+%description -n java-tomcat-jasper
 Jasper is Java ServerPages compiler used by Apache Tomcat servlet
 container.
 
-%description jasper -l pl.UTF-8
+%description -n java-tomcat-jasper -l pl.UTF-8
 Jasper jest kompilatorem Java ServerPages używanym przez kontener
 servletów Apache Tomcat.
 
+%package -n java-servletapi
+Summary:	Java servlet and JSP implementation classes
+Summary(pl.UTF-8):	Klasy z implementacją Java Servlet i JSP
+Group:		Libraries/Java
+Provides:	java(jsp) = %{jspapiver}
+Provides:	java(servlet) = %{servletapiver}
+Obsoletes:	jakarta-servletapi5
+Obsoletes:	java-servletapi5
+
+%description -n java-servletapi
+Implementation classes of the Java Servlet and JSP APIs (packages
+javax.servlet, javax.servlet.http, javax.servlet.jsp, and
+javax.servlet.jsp.tagext).
+
+%description -n java-servletapi -l pl.UTF-8
+Implementacje klas API Java Servlet i JSP (pakiety javax.servlet,
+javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
+
 %prep
-%setup -q -n %{name}-%{version}-src
-%patch0 -p1
-%patch1 -p1
+%setup -q -n apache-%{name}-%{version}-src
+%patch0 -p0
+%patch1 -p0
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
-# servletapi built from jakarta-servletapi5.spec
-rm -rf servletapi
+# we don't need those scripts
+rm bin/*.bat
+rm bin/{startup,shutdown}.sh
 
-# Remove pre-built jars
-find -name '*.jar' | xargs rm -fv
+cp -a %{SOURCE3} build.properties
 
 %build
 TOPDIR=$(pwd)
 
-%if 0
-# build jasper javadocs
-cd jasper
-CLASSPATH=$(build-classpath xml-commons-apis)
-# building jasper needs eclipse classes
-cat > build.properties <<EOF
-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=$(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
-#%ant dist
+%ant \
+	-Drpm.javadir=%{_javadir} \
+	-Drpm.libdir=%{_libdir}
 
 %if %{with javadoc}
-%ant javadoc \
-	-Dcompile.source=1.4 \
-	-Dbuild.compiler=modern \
-
-%endif
-cd -
+%ant -f dist.xml dist-javadoc
 %endif
 
-# build tomcat 5.5
-# XXX build process should fail if one of these find-jar commands fails
-#	 how to fix that?
-cat > build.properties <<EOF
-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=$(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)
-%{?with_jta:jta.jar=$(find-jar jta)}
-puretls.jar=$(find-jar puretls)
-servlet-api.jar=$(find-jar servlet-api)
-servletapi.build.notrequired=true
-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=%{_javadir}-struts
-EOF
+%if %{with webservices}
+mkdir -p output/extras/webservices
 
-%ant \
-	-Dcompile.source=1.4
+ln -sf %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
+ln -sf %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
+
+%ant -f extras.xml webservices
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd build/build
+cd output/build
+
 TOMCATDIR=$RPM_BUILD_ROOT%{_tomcatdir}
 CATALINADIR=$RPM_BUILD_ROOT/var/lib/tomcat
 
-# we don't need dos scripts
-rm -f bin/*.bat
-
-randpw=$(echo $RANDOM$$ | md5sum | cut -c 1-15)
-%{__sed} -i -e "s:SHUTDOWN:${randpw}:" conf/{server,server-minimal}.xml
+# useful for constructing relative symlinks. Is there a better way?
+TOMCATDIRREV=$(echo %{_tomcatdir} | sed 's#[^/]\+#..#g;s#^/##')
+CATALINADIRREV=$(echo /var/lib/tomcat | sed 's#[^/]\+#..#g;s#^/##')
+SYSCONFDIRREV=$(echo %{_sysconfdir} | sed 's#[^/]\+#..#g;s#^/##')
 
-install -d $TOMCATDIR/bin \
-	    $TOMCATDIR/common/{lib,classes,endorsed} \
-	    $TOMCATDIR/server/{lib,classes} \
-	    $TOMCATDIR/webapps \
-	    $RPM_BUILD_ROOT%{_logdir}/tomcat \
+install -d $TOMCATDIR \
+	    $CATALINADIR/temp \
 	    $RPM_BUILD_ROOT%{_vardir}/webapps \
 	    $RPM_BUILD_ROOT%{_vardir}/work \
 	    $RPM_BUILD_ROOT%{_vardir}/conf \
+	    $RPM_BUILD_ROOT%{_logdir}/tomcat \
 	    $RPM_BUILD_ROOT/etc/sysconfig \
 	    $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
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
+cp -a %{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 -a conf/* $CATALINADIR/conf
+install -d $CATALINADIR/conf/Catalina/localhost
+cp -a %{SOURCE10} $CATALINADIR/conf/Catalina/localhost/ROOT.xml
+cp -a %{SOURCE11} $CATALINADIR/conf/Catalina/localhost/docs.xml
+cp -a %{SOURCE12} $CATALINADIR/conf/Catalina/localhost/manager.xml
+cp -a %{SOURCE13} $CATALINADIR/conf/Catalina/localhost/host-manager.xml
+cp -a %{SOURCE14} $CATALINADIR/conf/Catalina/localhost/examples.xml
 
-cp -rf server/webapps $TOMCATDIR/server
-cp -rf webapps $TOMCATDIR
-cp -rf shared $TOMCATDIR
-cp -rf temp $CATALINADIR
+cp -a bin lib webapps $TOMCATDIR
+cp -a temp $CATALINADIR
 
-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}
+ln -sf $CATALINADIRREV%{_logdir}/tomcat $CATALINADIR/logs
+ln -sf $TOMCATDIRREV%{_logdir}/tomcat $TOMCATDIR/logs
+ln -sf $TOMCATDIRREV%{_vardir}/work $TOMCATDIR/work
+ln -sf $TOMCATDIRREV%{_vardir}/conf $TOMCATDIR/conf
+ln -sf $SYSCONFDIRREV%{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}/tomcat
 
 # symlinks instead of copies
-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
-ln -sf $(find-jar jsp-api) $TOMCATDIR/common/lib/jsp-api.jar
-
-ln -sf $(find-jar commons-modeler) $TOMCATDIR/server/lib/commons-modeler.jar
-
-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
-ln -sf $(find-jar struts-taglib) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/struts-taglib.jar
-ln -sf $(find-jar commons-collections) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/commons-collections.jar
-ln -sf $(find-jar commons-beanutils-core) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/commons-beanutils-core.jar
-ln -sf $(find-jar commons-digester) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/commons-digester.jar
-ln -sf $(find-jar commons-chain) $TOMCATDIR/server/webapps/admin/WEB-INF/lib/commons-chain.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-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
-%{?with_jta: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
+jars="commons-daemon commons-logging-api"
+for jar in $jars; do
+	jar=$(find-jar $jar)
+	ln -sf $jar $TOMCATDIR/bin
+done
+
+jars="commons-pool-tomcat5 commons-dbcp-tomcat5 mysql-connector-java org.eclipse.jdt.core mail"
+for jar in $jars; do
+	jar=$(find-jar $jar)
+	ln -sf $jar $TOMCATDIR/lib
+done
 
 install -d $RPM_BUILD_ROOT%{_javadir}
-mv $TOMCATDIR/common/lib/jasper* $RPM_BUILD_ROOT%{_javadir}
-ln -sf %{_javadir}/jasper-compiler-jdt.jar $TOMCATDIR/common/lib/
-ln -sf %{_javadir}/jasper-compiler.jar $TOMCATDIR/common/lib/
-ln -sf %{_javadir}/jasper-runtime.jar $TOMCATDIR/common/lib/
+mv $TOMCATDIR/lib/jasper*.jar $RPM_BUILD_ROOT%{_javadir}
+mv $TOMCATDIR/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api-%{jspapiver}.jar
+mv $TOMCATDIR/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{servletapiver}.jar
+mv $TOMCATDIR/lib/catalina.jar $RPM_BUILD_ROOT%{_javadir}/tomcat6-catalina.jar
+mv $TOMCATDIR/lib/tomcat-coyote.jar $RPM_BUILD_ROOT%{_javadir}/tomcat6-coyote.jar
+
+ln -s jsp-api-%{jspapiver}.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api.jar
+ln -s servlet-api-%{servletapiver}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.jar
+
+# XXX add softlinks jasper-compiler.jar and jasper-runtime for compatibility with tomcat 5.5?
+ln -sf %{_javadir}/jasper-el.jar $TOMCATDIR/lib
+ln -sf %{_javadir}/jasper.jar $TOMCATDIR/lib
+
+ln -sf %{_javadir}/jsp-api-%{jspapiver}.jar $TOMCATDIR/lib/jsp-api.jar
+ln -sf %{_javadir}/servlet-api-%{servletapiver}.jar $TOMCATDIR/lib/servlet-api.jar
+
+ln -sf %{_javadir}/tomcat6-catalina.jar $TOMCATDIR/lib/catalina.jar
+ln -sf %{_javadir}/tomcat6-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
+
+%if %{with webservices}
+install ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar
+
+ln -s %{_javadir}/geronimo-spec-jaxrpc.jar $TOMCATDIR/lib/jaxrpc.jar
+ln -s %{_javadir}/jsr109.jar $TOMCATDIR/lib/jsr109.jar
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
 %groupadd -g 234 -r -f tomcat
-%useradd -u 234 -r -d /var/lib/tomcat -s /bin/false -c "Tomcat User" -g tomcat tomcat
+%groupadd -g 237 -r -f servlet
+%useradd -u 234 -r -d /var/lib/tomcat -s /bin/false -c "Tomcat User" -g tomcat -G servlet tomcat
 
 %post
 /sbin/chkconfig --add tomcat
@@ -393,77 +354,107 @@ fi
 if [ "$1" = "0" ]; then
 	%userremove tomcat
 	%groupremove tomcat
+	%groupremove servlet
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc build/{RELEASE-NOTES,RUNNING.txt}
+%doc KEYS RELEASE-NOTES RELEASE-PLAN-6.0.txt RUNNING.txt
 %attr(754,root,root) /etc/rc.d/init.d/tomcat
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tomcat
-%{_sysconfdir}
+%{_sysconfdir}/tomcat
 %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
-%dir %{_tomcatdir}/server
-%dir %{_tomcatdir}/server/classes
-%{_tomcatdir}/server/lib
-%dir %{_tomcatdir}/server/webapps
-%{_tomcatdir}/server/webapps/host-manager
-%{_tomcatdir}/server/webapps/manager
-%{_tomcatdir}/webapps
+%dir %{_tomcatdir}/lib
+%{_tomcatdir}/lib/annotations-api.jar
+%{_tomcatdir}/lib/catalina-ant.jar
+%{_tomcatdir}/lib/catalina-ha.jar
+%{_tomcatdir}/lib/catalina.jar
+%{_tomcatdir}/lib/catalina-tribes.jar
+%{_tomcatdir}/lib/commons-dbcp-tomcat5.jar
+%{_tomcatdir}/lib/commons-pool-tomcat5.jar
+%{_tomcatdir}/lib/el-api.jar
+%{_tomcatdir}/lib/jasper-el.jar
+%{_tomcatdir}/lib/jasper.jar
+%{_tomcatdir}/lib/jsp-api.jar
+%{_tomcatdir}/lib/mail.jar
+%{_tomcatdir}/lib/mysql-connector-java.jar
+%{_tomcatdir}/lib/org.eclipse.jdt.core.jar
+%{_tomcatdir}/lib/servlet-api.jar
+%{_tomcatdir}/lib/tomcat-coyote.jar
+%{_tomcatdir}/lib/tomcat-i18n-es.jar
+%{_tomcatdir}/lib/tomcat-i18n-fr.jar
+%{_tomcatdir}/lib/tomcat-i18n-ja.jar
+
+%dir %{_tomcatdir}/webapps
+
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/ROOT.xml
+%{_tomcatdir}/webapps/ROOT
+
+%{_tomcatdir}/logs
 %{_tomcatdir}/work
-%{_tomcatdir}/shared
-%dir %{_vardir}
-%dir %{_vardir}/conf
-%dir %{_vardir}/conf/Catalina
+%dir %attr(770,root,tomcat) %{_vardir}
+# these directory has to be writeable because /admin need to modify config
+# files and create temporary files
+%dir %attr(770,root,tomcat) %{_vardir}/conf
+%dir %attr(770,root,tomcat) %{_vardir}/conf/Catalina
 %dir %{_vardir}/conf/Catalina/localhost
-# tomcat config has to be writeable because of tomacta-users.xml file and Catalina dir
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/MANIFEST.MF
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/catalina.policy
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/*.properties*
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/*.manifest
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/*.xml
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/balancer.xml
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/host-manager.xml
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/jsp-examples.xml
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/manager.xml
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/ROOT.xml
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/tomcat-docs.xml
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/webdav.xml
-%dir %attr(1730,root,tomcat) %{_vardir}/work
-%dir %attr(775,root,tomcat) %{_vardir}/webapps
-%dir %attr(775,root,tomcat) %{_vardir}/temp
-%dir %attr(775,root,tomcat) %{_logdir}/tomcat
+# tomcat config has to be writeable because of tomcat-users.xml file and Catalina dir
+%config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/catalina.policy
+%config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/*.properties*
+%config(noreplace) %attr(660,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/*.xml
+%dir %attr(770,root,tomcat) %{_vardir}/work
+%dir %attr(770,root,tomcat) %{_vardir}/webapps
+%dir %attr(770,root,tomcat) %{_vardir}/temp
+%dir %attr(770,root,tomcat) %{_logdir}/tomcat
 %{_vardir}/logs
 
-%if 0
-%files doc
+%files webapp-docs
+%defattr(644,root,root,755)
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/docs.xml
+%{_tomcatdir}/webapps/docs
+
+%files webapp-manager
 %defattr(644,root,root,755)
-%doc catalina/docs/*
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/manager.xml
+%{_tomcatdir}/webapps/manager
+
+%files webapp-host-manager
+%defattr(644,root,root,755)
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/host-manager.xml
+%{_tomcatdir}/webapps/host-manager
+
+%files webapp-examples
+%defattr(644,root,root,755)
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/examples.xml
+%{_tomcatdir}/webapps/examples
+
+%if %{with webservices}
+%files webservices
+%defattr(644,root,root,755)
+%{_tomcatdir}/lib/catalina-ws.jar
+%{_tomcatdir}/lib/jsr109.jar
+%{_tomcatdir}/lib/jaxrpc.jar
 %endif
 
-%files admin
+%files -n java-tomcat-jasper
+%defattr(644,root,root,755)
+%{_javadir}/jasper-el.jar
+%{_javadir}/jasper.jar
+
+%files -n java-tomcat-catalina
+%defattr(644,root,root,755)
+%{_javadir}/tomcat6-catalina.jar
+
+%files -n java-tomcat-coyote
 %defattr(644,root,root,755)
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size) %{_vardir}/conf/Catalina/localhost/admin.xml
-%{_tomcatdir}/server/webapps/admin
+%{_javadir}/tomcat6-coyote.jar
 
-%files jasper
+%files -n java-servletapi
 %defattr(644,root,root,755)
-%{_javadir}/jasper-compiler-jdt.jar
-%{_javadir}/jasper-compiler.jar
-%{_javadir}/jasper-runtime.jar
+%{_javadir}/jsp-api*.jar
+%{_javadir}/servlet-api*.jar