rpms/eclipse/devel eclipse.spec,1.283,1.284

[fedora-cvs-commits at redhat.com]

Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5238

Modified Files:
	eclipse.spec 
Log Message:
Fix tomcat symlinks.


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -r1.283 -r1.284
--- eclipse.spec	4 Jul 2006 21:27:47 -0000	1.283
+++ eclipse.spec	4 Jul 2006 22:25:52 -0000	1.284
@@ -584,6 +584,17 @@
 rm plugins/org.eclipse.tomcat/naming-common.jar
 rm plugins/org.eclipse.tomcat/servlets-common.jar
 rm plugins/org.eclipse.tomcat/tomcat-http11.jar
+rm plugins/org.eclipse.tomcat/bootstrap.jar
+rm plugins/org.eclipse.tomcat/catalina.jar
+rm plugins/org.eclipse.tomcat/jasper-compiler.jar
+rm plugins/org.eclipse.tomcat/jasper-runtime.jar
+rm plugins/org.eclipse.tomcat/mx4j-jmx.jar
+rm plugins/org.eclipse.tomcat/naming-resources.jar
+rm plugins/org.eclipse.tomcat/naming-factory.jar
+rm plugins/org.eclipse.tomcat/servlets-default.jar
+rm plugins/org.eclipse.tomcat/servlets-invoker.jar
+rm plugins/org.eclipse.tomcat/tomcat-coyote.jar
+rm plugins/org.eclipse.tomcat/tomcat-util.jar
 ln -s %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar
 ln -s %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar
 ln -s %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar
@@ -601,6 +612,7 @@
 ln -s %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat/tomcat-coyote.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat/tomcat-http11.jar
 ln -s %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat/tomcat-util.jar
+mkdir -p plugins/org.eclipse.tomcat/lib
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-beanutils
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-collections
 build-jar-repository -s -p plugins/org.eclipse.tomcat/lib jakarta-commons-dbcp
@@ -666,7 +678,7 @@
   fi
 done
 if [ ! -z "$JARS" ]; then
-    echo "These jar should be deleted and syslinked to system jars: $JARS"
+    echo "These jar should be deleted and symlinked to system jars: $JARS"
    #FIXME: enable  exit 1
 fi
 
@@ -1612,6 +1624,9 @@
 %endif
 
 %changelog
+* Tue Jul 04 2006 Ben Konrath <bkonrath at redhat.com> 3.2.0-1jpp_1fc
+- Fix tomcat symlinks. 
+
 * Tue Jul 04 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
 - 3.2.0.
 - Remove Provides:  eclipse-sdk from eclipse-platform.