From 4fdd733d651f1f13cda5a7e477802bb38adfe5cf Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Jul 06 2006 02:25:27 +0000
Subject: - Don't include tomcat jars in %%files for ix86, ppc, x86_64, ia64.

- Use tomcat plugin version instead of org.eclipse.tomcat_*.

---

diff --git a/eclipse.spec b/eclipse.spec
index 6eff59f..8af3b9a 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1062,38 +1062,39 @@ ln -sf %{_javadir}/lucene.jar plugins/org.apache.lucene_*/lucene-1.4.3.jar
 
 %ifnarch ppc64 s390 s390x
 ## BEGIN TOMCAT ##
-mkdir -p plugins/org.eclipse.tomcat_*/lib
-ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/lib/bootstrap.jar
-ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/lib/catalina.jar
-ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/lib/catalina-optional.jar
-ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_*/lib/jasper-compiler.jar
-ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_*/lib/jasper-runtime.jar
-ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_*/lib/mx4j.jar
-ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_*/lib/mx4j-impl.jar
-ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_*/lib/mx4j-jmx.jar
-ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_*/lib/naming-common.jar
-ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_*/lib/naming-factory.jar
-ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_*/lib/naming-resources.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_*/lib/servlets-common.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/lib/servlets-default.jar
-ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/lib/servlets-invoker.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/lib/tomcat-coyote.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat_*/lib/tomcat-http.jar
-ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/lib/tomcat-util.jar
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-beanutils
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-collections
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-dbcp
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-digester
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-digester-rss
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-el
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-fileupload
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-launcher
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-logging-api
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-modeler
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib commons-pool
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib jspapi
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib regexp
-build-jar-repository -s -p plugins/org.eclipse.tomcat_*/lib servletapi5
+TOMCATPLUGINVERSION=$(ls | grep tomcat | sed 's/org.eclipse.tomcat_//')
+mkdir -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib
+ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/bootstrap.jar
+ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/catalina.jar
+ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/catalina-optional.jar
+ln -s %{_javadir}/jasper5-compiler.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/jasper-compiler.jar
+ln -s %{_javadir}/jasper5-runtime.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/jasper-runtime.jar
+ln -s %{_javadir}/mx4j/mx4j.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j.jar
+ln -s %{_javadir}/mx4j/mx4j-impl.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j-impl.jar
+ln -s %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/mx4j-jmx.jar
+ln -s %{tomcatlibdir}/common/lib/naming-common.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-common.jar
+ln -s %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-factory.jar
+ln -s %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/naming-resources.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-common.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-common.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-default.jar
+ln -s %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/servlets-invoker.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-coyote.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-http.jar
+ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib/tomcat-util.jar
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-beanutils
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-collections
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-dbcp
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-digester
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-digester-rss
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-el
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-fileupload
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-launcher
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-logging-api
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-modeler
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib commons-pool
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib jspapi
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib regexp
+build-jar-repository -s -p plugins/org.eclipse.tomcat_$TOMCATPLUGINVERSION/lib servletapi5
 ## END TOMCAT ##
 %endif
 build-jar-repository -s -p plugins/org.junit_* junit
@@ -1581,9 +1582,12 @@ fi
 %{_libdir}/gcj/%{name}/org.eclipse.search_*
 %{_libdir}/gcj/%{name}/org.eclipse.text_*
 %{_libdir}/gcj/%{name}/com.ibm.icu_*
-%ifnarch ppc64 s390 s390x
-# FIXME: take this out when the tomcat patch is updated
+# FIXME:  we need to symlink these
 %{_libdir}/gcj/%{name}/ant-apache-bsf.jar*
+%{_libdir}/gcj/%{name}/jsp.jar*
+%{_libdir}/gcj/%{name}/parser.jar*
+# FIXME: take this out when tomcat is built on these arches
+%ifarch ppc64 s390 s390x
 %{_libdir}/gcj/%{name}/bootstrap.jar*
 %{_libdir}/gcj/%{name}/catalina.jar*
 %{_libdir}/gcj/%{name}/commons-beanutils.jar*
@@ -1594,12 +1598,10 @@ fi
 %{_libdir}/gcj/%{name}/jakarta-regexp-1.3.jar*
 %{_libdir}/gcj/%{name}/jasper-compiler.jar*
 %{_libdir}/gcj/%{name}/jasper-runtime.jar*
-%{_libdir}/gcj/%{name}/jsp.jar*
 %{_libdir}/gcj/%{name}/mx4j-jmx.jar*
 %{_libdir}/gcj/%{name}/naming-common.jar*
 %{_libdir}/gcj/%{name}/naming-factory.jar*
 %{_libdir}/gcj/%{name}/naming-resources.jar*
-%{_libdir}/gcj/%{name}/parser.jar*
 %{_libdir}/gcj/%{name}/servlet.jar*
 %{_libdir}/gcj/%{name}/servlets-common.jar*
 %{_libdir}/gcj/%{name}/servlets-default.jar*
@@ -1630,6 +1632,8 @@ fi
 - Use commons-* instead of jakarta-commons-*.
 - Don't delete jars in %%install.
 - Don't apply tomcat and webapp patches on ppc64, s390, and s390x (for now).
+- Don't include tomcat jars in %%files for ix86, ppc, x86_64, ia64.
+- Use tomcat plugin version instead of org.eclipse.tomcat_*.
 
 * Tue Jul 04 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-1jpp_1fc
 - Fix tomcat symlinks.