X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache-tomcat.spec;h=31ba2a1b040d9f0838e9516b400eae4e0e4b8ad3;hb=97eb666ecc93d85ce7687130fba2f4834382e6aa;hp=dacec135563a8813708555815df19d5419e680bd;hpb=277437100de2418e3cba2893fecdb4978de1224e;p=packages%2Fapache-tomcat.git

diff --git a/apache-tomcat.spec b/apache-tomcat.spec
index dacec13..31ba2a1 100644
--- a/apache-tomcat.spec
+++ b/apache-tomcat.spec
@@ -1,54 +1,100 @@
-Summary:	The Tomcat Servlet/JSP Container
+# 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):	Tomcat - Zasobnik servletów/JSP
 Name:		jakarta-tomcat
-Version:	4.0.1
-%define		base_version 4.0
-Release:	3
+Version:	5.5.23
+Release:	0.1
 License:	Apache
 Group:		Development/Languages/Java
-Source0:	http://jakarta.apache.org/builds/%{name}-%{base_version}/release/v%{version}/src/%{name}-%{version}-src.tar.gz
-URL:		http://jakarta.apache.org/tomcat/index.html
-Requires:	jre
-Requires:	jaxp
-Requires:	xerces-j
-Requires:	jakarta-servletapi
-Requires:	jdbc-stdext
-Requires:	jmx
-Requires:	jndi
-Requires:	jaf
-Requires:	javamail
-Requires:	jta
-Requires:	jsse
-Requires:	tyrex
-Requires:	jakarta-regexp
-Requires:	junit
-Requires:	ldap
-BuildRequires:	jdk
-BuildRequires:	jakarta-ant
-BuildRequires:	jaxp
-BuildRequires:	xerces-j
-BuildRequires:	jakarta-servletapi
-BuildRequires:	jdbc-stdext
-BuildRequires:	jmx
-BuildRequires:	jndi
-BuildRequires:	jaf
-BuildRequires:	javamail
-BuildRequires:	jta
-BuildRequires:	jsse
-BuildRequires:	tyrex
+#Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/src/%{name}-%{version}-src.tar.gz
+Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-tomcat-%{version}-src.tar.gz
+# Source0-md5:	362d1d8b15dc09882440dcab8c592dd7
+#Source0:	http://apache.zone-h.org/
+Source1:	%{name}.init
+URL:		http://tomcat.apache.org/
+# required:
+BuildRequires:	ant >= 1.5.3
+BuildRequires:	jaas
+BuildRequires:	jakarta-commons-beanutils
+BuildRequires:	jakarta-commons-collections
+BuildRequires:	jakarta-commons-digester
+BuildRequires:	jakarta-commons-fileupload
+BuildRequires:	jakarta-commons-logging
 BuildRequires:	jakarta-regexp
-BuildRequires:	junit
-BuildRequires:	ldap
+BuildRequires:	jakarta-servletapi >= 4
+BuildRequires:	jakarta-struts >= 1.0.2
+BuildRequires:	jaxp_parser_impl
+BuildRequires:	jdk >= 1.2
+BuildRequires:	jpackage-utils
+BuildRequires:	mx4j >= 1.1.1
+BuildRequires:	puretls
+BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	xerces-j
+# optional:
+BuildRequires:	jaf >= 1.0.1
+BuildRequires:	jakarta-commons-daemon
+BuildRequires:	jakarta-commons-dbcp
+BuildRequires:	jakarta-commons-modeler
+BuildRequires:	jakarta-commons-pool
+BuildRequires:	javamail >= 1.2
+BuildRequires:	jdbc-stdext >= 2.0
+BuildRequires:	jndi >= 1.2.1
+BuildRequires:	jsse >= 1.0.2
+BuildRequires:	jta >= 1.0.1
+BuildRequires:	junit >= 3.7
+BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	tyrex >= 1.0
+BuildRequires:	xml-commons
+Requires(post,postun):	/sbin/ldconfig
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+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:	javamail >= 1.2
+Requires:	jaxp_parser_impl
+Requires:	jdbc-stdext >= 2.0
+Requires:	jndi >= 1.2.1
+Requires:	jre >= 1.2
+Requires:	jsse >= 1.0.2
+Requires:	jta >= 1.0.1
+Requires:	mx4j >= 1.1.1
+Requires:	rc-scripts
+Requires:	tyrex >= 1.0
+Requires:	xml-commons
+Provides:	group(http)
+Provides:	user(http)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javalibdir	/usr/share/java
 %define		_tomcatdir	%{_libdir}/tomcat
 %define 	_logdir		%{_var}/log
+%define		_vardir		%{_var}/lib/tomcat
 
 %description
-Tomcat 4.0, a server that implements the Servlet 2.3 and JSP 1.2
-Specifications from Java Software.
+Tomcat is the servlet container that is used in the official Reference
+Implementation for the Java Servlet and JavaServer Pages technologies.
+The Java Servlet and JavaServer Pages specifications are developed by
+Sun under the Java Community Process.
+
+Tomcat is developed in an open and participatory environment and
+released under the Apache Software License. Tomcat is intended to be a
+collaboration of the best-of-breed developers from around the world.
+We invite you to participate in this open development project.
 
 %description -l pl
 Tomcat 4.0 - serwer implementuj±cy specyfikacje Servlet 2.3 oraz JSP
@@ -56,7 +102,7 @@ Tomcat 4.0 - serwer implementuj
 
 %package doc
 Summary:	The Tomcat Servlet/JSP Container documentation
-Summary(pl):	Dokumentacja do Tomcata.
+Summary(pl):	Dokumentacja do Tomcata
 Group:		Development/Languages/Java
 
 %description doc
@@ -66,165 +112,270 @@ The Tomcat Servlet/JSP Container documentation.
 Dokumentacja do Tomcata.
 
 %prep
-%setup -q -n %{name}-%{version}-src
+%setup -q -n apache-tomcat-%{version}-src/
+
+# Remove pre-built jars
+find -name '*.jar' | xargs rm -fv
 
 %build
-if [ ! `echo $JAVA_HOME` ]; then
-	echo "You haven't JAVA_HOME variable set. Can't continue."
-	exit 1
-fi
-		
-ANT_HOME=%{_javalibdir}
-export ANT_HOME
-
-cat > build.properties << EOF
-# ----- Compile Control Flags -----
-compile.debug=on
-compile.deprecation=off
-compile.optimize=on
-
-# ----- Default Base Path for Dependent Packages -----
-base.path=%{_prefix}
-
-# ----- Jakarta Regular Expressions Library, version 1.2 -----
-regexp.home=%{_javalibdir}
-regexp.lib=\${regexp.home}
-regexp.jar=\${regexp.home}/regexp.jar
-
-# ----- Jakarta Servlet API Classes (Servlet 2.3 / JSP 1.2) -----
-servlet.home=$RPM_BUILD_DIR/%{name}-%{version}-src/doc
-servlet.lib=%{_javalibdir}
-servlet.jar=\${servlet.lib}/servlet.jar
-
-# ----- Java Activation Framework (JAF), version 1.0.1 or later -----
-activation.home=%{_javalibdir}
-activation.lib=\${activation.home}
-activation.jar=\${activation.lib}/activation.jar
-
-# ----- Java API for XML Processing (JAXP), version 1.1 or later -----
-jaxp.home=%{_javalibdir}
-jaxp.lib=\${jaxp.home}
-crimson.jar=\${jaxp.lib}/crimson.jar
-jaxp.jar=\${jaxp.lib}/jaxp.jar
-xalan.jar=\${jaxp.lib}/xalan.jar
-
-# ----- Java Database Connectivity (JDBC) Optional Package, version 2.0 -----
-jdbc20ext.home=%{_javalibdir}
-jdbc20ext.lib=\${jdbc20ext.home}
-jdbc20ext.jar=\${jdbc20ext.lib}/jdbc2_0-stdext.jar
-
-# ----- Java Mail, version 1.2 or later -----
-mail.home=%{_javalibdir}
-mail.lib=\${mail.home}
-mail.jar=\${mail.lib}/mail.jar
-
-# ----- Java Management Extensions (JMX) RI, version 1.0.1 or later -----
-jmx.home=%{_javalibdir}
-jmx.lib=\${jmx.home}
-jmxri.jar=\${jmx.lib}/jmxri.jar
-
-# ----- Java Naming and Directory Interface (JNDI), version 1.2 or later -----
-jndi.home=%{_javalibdir}
-jndi.lib=\${jndi.home}
-jndi.jar=\${jndi.lib}/jndi.jar
-ldap.jar=\${jndi.lib}/ldap.jar
-
-# ----- Java Secure Sockets Extension (JSSE), version 1.0.2 or later -----
-jsse.home=%{_javalibdir}
-jsse.lib=\${jsse.home}
-jcert.jar=\${jsse.lib}/jcert.jar
-jnet.jar=\${jsse.lib}/jnet.jar
-jsse.jar=\${jsse.lib}/jsse.jar
-
-# ----- Java Transaction API (JTA), version 1.0.1 or later -----
-jta.home=%{_javalibdir}
-jta.lib=\${jta.home}
-jta.jar=\${jta.lib}/jta.jar
-
-# ----- JUnit Unit Test Suite, version 3.7 or later -----
-junit.home=%{_javalibdir}
-junit.lib=\${junit.home}
-junit.jar=\${junit.lib}/junit.jar
-
-# ----- Tyrex Data Source, version 0.9.7 -----
-tyrex.home=%{_javalibdir}
-tyrex.lib=\${tyrex.home}
-tyrex.jar=\${tyrex.lib}/tyrex.jar
-
-# ----- Xerces XML Parser, version 1.4.3 or later -----
-xerces.home=%{_javalibdir}/classes
-xerces.lib=\${xerces.home}
-xerces.jar=\${xerces.lib}/xerces.jar
+TOPDIR=$(pwd)
+
+# build jsp-api, servlet-api as ant dist will later on require them for webapps
+cd servletapi/jsr154
+%ant -Dservletapi.build=build -Dservletapi.dist=dist -Dbuild.compiler=modern dist
+
+cd ../jsr152
+%ant -Dservletapi.build=build -Dservletapi.dist=dist -Dbuild.compiler=modern dist
+
+# build jasper subpackage
+cd ../../jasper
+CLASSPATH=$(build-classpath xml-commons-apis xalan)
+export CLASSPATH=$CLASSPATH:$TOPDIR/servletapi/jsr154/dist/lib/servlet-api.jar
+cat > build.properties <<EOF
+ant.jar=$(build-classpath ant)
+servlet-api.jar=$TOPDIR/servletapi/jsr154/dist/lib/servlet-api.jar
+jsp-api.jar=$TOPDIR/servletapi/jsr152/dist/lib/jsp-api.jar
+tools.jar=%{java_home}/lib/tools.jar
+xerces.jar=$(build-classpath xerces)
+xercesImpl.jar=$(build-classpath jaxp_parser_impl)
+xmlParserAPIs.jar=$(build-classpath xml-commons-apis)
+commons-el.jar=$(build-classpath commons-el)
+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)
+jasper-compiler-jdt.jar=$(build-classpath jdtcore)
+EOF
+%ant -Dbuild.compiler=modern javadoc
+
+# build tomcat 5.5
+cd ../build
+cat >> build.properties <<EOF
+ant.jar=%{_javadir}/ant.jar
+ant-launcher.jar=%{_javadir}/ant-launcher.jar
+jtc.home=$TOPDIR/jakarta-tomcat-connectors/
+jasper.home=$TOPDIR/jakarta-tomcat-jasper/jasper2
+commons-beanutils.jar=$(build-classpath commons-beanutils)
+commons-fileupload.jar=$(build-classpath commons-fileupload)
+commons-collections.jar=$(build-classpath commons-collections)
+commons-dbcp.jar=$(build-classpath commons-dbcp)
+commons-digester.jar=$(build-classpath commons-digester)
+commons-el.jar=$(build-classpath commons-el)
+commons-launcher.jar=$(build-classpath commons-launcher)
+commons-logging.jar=$(build-classpath commons-logging)
+commons-logging-api.jar=$(build-classpath commons-logging-api)
+commons-modeler.jar=$(build-classpath commons-modeler)
+commons-pool.jar=$(build-classpath commons-pool)
+jmx.jar=$(build-classpath jre/jmx)
+jmx-tools.jar=$(build-classpath jre/jmx)
+jmxri.jar=$(build-classpath jre/jmx)
+junit.jar=$(build-classpath junit)
+regexp.jar=$(build-classpath regexp)
+servlet-api.jar=$TOPDIR/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar
+jsp-api.jar=$TOPDIR/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar
+servlet.doc=$TOPDIR/jakarta-servletapi-5/jsr154/dist/docs/api
+xercesImpl.jar=$(build-classpath jaxp_parser_impl)
+xml-apis.jar=$(build-classpath xml-commons-apis)
+struts.jar=$(build-classpath struts)
+struts.lib=%{_datadir}/struts
+activation.jar=$(build-classpath jaf)
+mail.jar=$(build-classpath javamail/mailapi)
+jta.jar=$(build-classpath jta)
+tyrex.jar=$(build-classpath tyrex)
+jaas.jar=$(build-classpath jre/jaas)
+jndi.jar=$(build-classpath jre/jndi)
+jdbc20ext.jar=$(build-classpath jdbc-stdext)
+puretls.jar=$(build-classpath puretls)
+jcert.jar=$(build-classpath java/jcert)
+jnet.jar=$(build-classpath java/jnet)
+jsse.jar=$(build-classpath java/jsse)
+servletapi.build.notrequired=true
+jspapi.build.notrequired=true
+taglibs-core.jar=$(build-classpath taglibs-core)
+taglibs-standard.jar=$(build-classpath taglibs-standard)
 EOF
 
-install -d doc/docs/api
-
-ant dist
+%ant build
+
+exit 1
+
+%if 0
+# build tomcat 5
+
+# build the connectors
+cd ../jakarta-tomcat-connectors
+
+# this is just plain and simply evil but something changed in a major way between 5.0.16 and 5.0.18
+oldclasspath=$CLASSPATH
+export CLASSPATH=$TOPDIR/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar:\
+$TOPDIR/jakarta-tomcat-5/build/server/lib/catalina.jar
+
+cat > build.properties <<EOBP
+activation.jar=$(build-classpath jaf)
+ant.jar=%{_javadir}/ant.jar
+junit.jar=$(build-classpath junit)
+commons-beanutils.jar=$(build-classpath commons-beanutils)
+commons-collections.jar=$(build-classpath commons-collections)
+commons-digester.jar=$(build-classpath commons-digester)
+commons-fileupload.jar=$(build-classpath commons-fileupload)
+commons-logging.jar=$(build-classpath commons-logging)
+commons-logging-api.jar=$(build-classpath commons-logging-api)
+commons-modeler.jar=$(build-classpath commons-modeler)
+commons-pool.jar=$(build-classpath commons-pool)
+regexp.jar=$(build-classpath regexp)
+jmx.jar=$(build-classpath mx4j/mx4j)
+puretls=$(build-classpath puretls)
+activation.jar=$(build-classpath jaf)
+mail.jar=$(build-classpath javamail/mailapi)
+jta.jar=$(build-classpath jta)
+tyrex.jar=$(build-classpath tyrex)
+jaas.jar=$(build-classpath jaas)
+jndi.jar=$(build-classpath jndi)
+jdbc20ext.jar=$(build-classpath java/jdbc-stdext)
+puretls.jar=$(build-classpath puretls)
+jcert.jar=$(build-classpath jsse/jcert)
+jnet.jar=$(build-classpath jsse/jnet)
+jsse.jar=$(build-classpath jsse/jsse)
+EOBP
+%ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
+export CLASSPATH=$oldclasspath
+
+# build the webapps and make the tree ready to install
+cd ../jakarta-tomcat-5
+%ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_tomcatdir}/bin \
-	    $RPM_BUILD_ROOT%{_tomcatdir}/classes \
-	    $RPM_BUILD_ROOT%{_tomcatdir}/common/{lib,classes} \
-	    $RPM_BUILD_ROOT%{_tomcatdir}/lib \
-	    $RPM_BUILD_ROOT%{_tomcatdir}/server/{lib,classes} \
-	    $RPM_BUILD_ROOT%{_tomcatdir}/webapps \
-	    $RPM_BUILD_ROOT%{_tomcatdir}/work \
+DEST=$RPM_BUILD_ROOT%{_tomcatdir}
+
+install -d $DEST/bin \
+	    $DEST/common/{lib,classes,endorsed} \
+	    $DEST/server/{lib,classes} \
+	    $DEST/webapps \
 	    $RPM_BUILD_ROOT%{_sysconfdir}/tomcat \
-	    $RPM_BUILD_ROOT%{_logdir}/tomcat
-
-install build/bin/*.sh $RPM_BUILD_ROOT%{_tomcatdir}/bin
-install build/bin/*.jar $RPM_BUILD_ROOT%{_tomcatdir}/bin
-install build/common/lib/naming-*.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib
-install build/conf/* $RPM_BUILD_ROOT%{_sysconfdir}/tomcat
-install build/server/lib/[!r]*.jar $RPM_BUILD_ROOT%{_tomcatdir}/server/lib
-install build/lib/*.jar $RPM_BUILD_ROOT%{_tomcatdir}/lib
-cp -rf  build/webapps $RPM_BUILD_ROOT%{_tomcatdir}
-
-ln -sf %{_logdir}/tomcat $RPM_BUILD_ROOT%{_tomcatdir}/logs
-ln -sf %{_sysconfdir}/tomcat $RPM_BUILD_ROOT%{_tomcatdir}/conf
-
-
-ln -sf %{_javalibdir}/jaxp.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/jaxp.jar
-ln -sf %{_javalibdir}/classes/xerces.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/xerces.jar
-ln -sf %{_javalibdir}/servlet.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/servlet.jar
-ln -sf %{_javalibdir}/jdbc2_0-stdext.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/jdbc2_0.jar
-ln -sf %{_javalibdir}/jmxri.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/jmxri.jar
-ln -sf %{_javalibdir}/jndi.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/jndi.jar
-ln -sf %{_javalibdir}/ldap.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/ldap.jar
-ln -sf %{_javalibdir}/activation.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/activation.jar
-ln -sf %{_javalibdir}/jta.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/jta.jar
-ln -sf %{_javalibdir}/mail.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/mail.jar
-ln -sf %{_javalibdir}/jsse.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/jsse.jar
-
-ln -sf %{_javalibdir}/tyrex.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/tyrex.jar
-ln -sf %{_javalibdir}/junit.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/junit.jar
-ln -sf %{_javalibdir}/regexp.jar $RPM_BUILD_ROOT%{_tomcatdir}/common/lib/regexp.jar
+	    $RPM_BUILD_ROOT%{_logdir}/tomcat \
+	    $RPM_BUILD_ROOT%{_vardir}/work \
+	    $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
+
+# 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}/tyrex.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
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+%groupadd -g 51 -r -f http
+%useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http
+
+%post
+/sbin/chkconfig --add tomcat
+%service tomcat restart
+
+%preun
+if [ "$1" = "0" ]; then
+	%service tomcat stop
+	/sbin/chkconfig --del tomcat
+fi
+
+%postun
+if [ "$1" = "0" ]; then
+	%userremove http
+	%groupremove http
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc *.txt LICENSE
+%dir %{_tomcatdir}
+%dir %{_tomcatdir}/bin
 %attr(755,root,root) %{_tomcatdir}/bin/*.sh
-%dir %{_tomcatdir}/common/classes
-%dir %{_tomcatdir}/classes
-%dir %{_tomcatdir}/server
-%dir %{_tomcatdir}/server/classes
-%dir %{_tomcatdir}/webapps
-%dir %{_tomcatdir}/work
-%dir %{_sysconfdir}/tomcat
-%dir %{_logdir}/tomcat
 %{_tomcatdir}/bin/*.jar
+%dir %{_tomcatdir}/common
+%dir %{_tomcatdir}/common/classes
+%dir %{_tomcatdir}/common/endorsed
+%{_tomcatdir}/common/endorsed/*.jar
 %{_tomcatdir}/common/lib
 %{_tomcatdir}/conf
-%{_tomcatdir}/lib
 %{_tomcatdir}/logs
+%dir %{_tomcatdir}/server
+%dir %{_tomcatdir}/server/classes
 %{_tomcatdir}/server/lib
-%{_tomcatdir}/webapps/*
-%{_sysconfdir}/tomcat/*
+%{_tomcatdir}/server/webapps
+%{_tomcatdir}/webapps
+%{_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
 
 %files doc
 %defattr(644,root,root,755)