-ln -sf %{_javadir}/commons-daemon.jar $TOMCATDIR/bin
-
-ln -sf %{_javadir}/activation.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/ant.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/commons-collections.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/commons-dbcp.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/commons-logging-api.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/commons-pool.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/servlet.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/servlet.jar $TOMCATDIR/common/lib/servletapi4.jar
-ln -sf %{_javadir}/jdbc-stdext.jar $TOMCATDIR/common/lib/jdbc2_0-stdext.jar
-ln -sf %{_javadir}/jdbc-stdext.jar $TOMCATDIR/common/lib/jdbc-stdext-2.0.jar
-ln -sf %{_javadir}/jmxri.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/jndi.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/jta.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/mail.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/jsse.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/junit.jar $TOMCATDIR/common/lib
-
-ln -sf %{_javadir}/mailapi.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/pop3.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/pop3.jar $TOMCATDIR/common/lib/pop.jar
-ln -sf %{_javadir}/smtp.jar $TOMCATDIR/common/lib
-ln -sf %{_javadir}/imap.jar $TOMCATDIR/common/lib
-
-ln -sf %{_javadir}/commons-beanutils.jar $TOMCATDIR/server/lib
-ln -sf %{_javadir}/commons-digester.jar $TOMCATDIR/server/lib
-ln -sf %{_javadir}/commons-fileupload.jar $TOMCATDIR/server/lib
-ln -sf %{_javadir}/commons-logging.jar $TOMCATDIR/server/lib
-ln -sf %{_javadir}/commons-modeler.jar $TOMCATDIR/server/lib
-ln -sf %{_javadir}/jaas.jar $TOMCATDIR/server/lib/jaas.jar
-ln -sf %{_javadir}/mx4j-jmx.jar $TOMCATDIR/server/lib
-ln -sf %{_javadir}/regexp.jar $TOMCATDIR/server/lib
-ln -sf %{_javadir}/regexp.jar $TOMCATDIR/server/lib/jakarta-regexp-1.2.jar
-ln -sf %{_javadir}/regexp.jar $TOMCATDIR/server/lib/regexp-1.2.jar
-
-ln -sf %{_javadir}/jaxp_parser_impl.jar $TOMCATDIR/common/endorsed
-ln -sf %{_javadir}/xml-commons-apis.jar $TOMCATDIR/common/endorsed
-
-ln -sf %{_javadir}/struts.jar $TOMCATDIR/server/webapps/admin/WEB-INF/lib
+jars="commons-el commons-dbcp-tomcat5 servlet-api jsp-api commons-modeler"
+for jar in $jars; do
+ jar=$(find-jar $jar)
+ ln -sf $jar $TOMCATDIR/common/lib
+done
+
+jars="jaxp_parser_impl xml-commons-apis"
+for jar in $jars; do
+ jar=$(find-jar $jar)
+ ln -sf $jar $TOMCATDIR/common/endorsed
+done
+
+jars="struts-core struts-taglib commons-collections commons-beanutils-core commons-digester commons-chain"
+for jar in $jars; do
+ jar=$(find-jar $jar)
+ ln -sf $jar $TOMCATDIR/server/webapps/admin/WEB-INF/lib
+done
+
+%if 0
+# do not make these symlinks as ant didn't do
+jars="commons-daemon"
+for jar in $jars; do
+ jar=$(find-jar $jar)
+ ln -sf $jar $TOMCATDIR/bin
+done
+
+jars="activation ant commons-dbcp commons-logging-api commons-pool servlet jdbc-stdext
+jmxri jndi %{?with_jta:jta} mail jsse junit mailapi pop3"
+for jar in $jars; do
+ jar=$(find-jar $jar)
+ ln -sf $jar $TOMCATDIR/common/lib
+done
+
+ln -sf servlet.jar $TOMCATDIR/common/lib/servletapi4.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 pop3.jar $TOMCATDIR/common/lib/pop.jar
+
+jars="commons-beanutils commons-digester commons-fileupload commons-logging jaas regexp"
+for jar in $jars; do
+ jar=$(find-jar $jar)
+ ln -sf $jar $TOMCATDIR/server/lib
+done
+ln -sf regexp.jar $TOMCATDIR/server/lib/jakarta-regexp-1.2.jar
+ln -sf regexp.jar $TOMCATDIR/server/lib/regexp-1.2.jar
+%endif
+
+install -d $RPM_BUILD_ROOT%{_javadir}
+mv $TOMCATDIR/common/lib/jasper*.jar $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