rpms/eclipse/FC-4 eclipse-webapp-tomcat5.patch, 1.1, 1.2 eclipse-icon.patch, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: overholt

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

Modified Files:
	eclipse-webapp-tomcat5.patch 
Removed Files:
	eclipse-icon.patch 
Log Message:
Remove unused patch.  Update patches to be the same as head.


eclipse-webapp-tomcat5.patch:
 build.properties |    7 +++++--
 build.xml        |   15 +++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

Index: eclipse-webapp-tomcat5.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse-webapp-tomcat5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-webapp-tomcat5.patch	5 Jul 2005 15:33:20 -0000	1.1
+++ eclipse-webapp-tomcat5.patch	5 Jul 2005 15:56:07 -0000	1.2
@@ -4,12 +4,67 @@
 retrieving revision 1.32
 diff -u -r1.32 build.properties
 --- build.properties	18 Mar 2005 08:00:28 -0000	1.32
-+++ build.properties	14 Jun 2005 15:47:53 -0000
-@@ -33,5 +33,5 @@
++++ build.properties	14 Jun 2005 19:05:33 -0000
+@@ -33,5 +33,8 @@
                       ../org.eclipse.help.appserver/bin,\
                       ../org.eclipse.help.appserver,\
                       ../org.eclipse.help.appserver/@dot,\
 -                     ../org.eclipse.tomcat/servlet.jar,\
 -                     ../org.eclipse.tomcat/jasper-runtime.jar
-+                     ../org.eclipse.tomcat/servletapi5-5.0.30.jar,\
-+                     ../org.eclipse.tomcat/jasper5-runtime-5.0.30.jar
++                     ../org.eclipse.tomcat/servletapi5.jar,\
++                     ../org.eclipse.tomcat/jasper-runtime.jar \
++                     ../org.eclipse.tomcat/jspapi.jar \
++                     ../org.eclipse.tomcat/jakarta-commons-el.jar \
++                     ../org.eclipse.tomcat/jakarta-commons-logging.jar
+--- build.xml.orig	2005-06-14 16:19:51.000000000 -0400
++++ build.xml	2005-06-14 16:20:41.000000000 -0400
+@@ -74,7 +74,7 @@
+ 				<pathelement path="../org.eclipse.help"/>
+ 				<pathelement path="../org.eclipse.help.base"/>
+ 				<pathelement path="../org.eclipse.help.appserver"/>
+-				<pathelement path="../org.eclipse.tomcat/servlet.jar"/>
++				<pathelement path="../org.eclipse.tomcat/servletapi5.jar"/>
+ 				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ 			</classpath>
+ 			<src path="src/"			/>
+@@ -126,7 +126,7 @@
+ 				<pathelement path="../org.eclipse.help"/>
+ 				<pathelement path="../org.eclipse.help.base"/>
+ 				<pathelement path="../org.eclipse.help.appserver"/>
+-				<pathelement path="../org.eclipse.tomcat/servlet.jar"/>
++				<pathelement path="../org.eclipse.tomcat/servletapi5.jar"/>
+ 				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ 			</classpath>
+ 			<src path="src_servlets/"			/>
+@@ -157,8 +157,11 @@
+ 			<pathelement location="../org.apache.ant/lib/optional.jar"/>
+ 			<pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
+ 			<pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
+-			<pathelement location="../org.eclipse.tomcat/servlet.jar" />
+-			<pathelement location="../org.eclipse.tomcat/tomcat_util.jar" />  
++			<pathelement location="../org.eclipse.tomcat/jspapi.jar" />
++			<pathelement location="../org.eclipse.tomcat/servletapi5.jar" />
++			<pathelement location="../org.eclipse.tomcat/tomcat-util.jar" />  
++			<pathelement location="../org.eclipse.tomcat/jakarta-commons-el.jar" />  
++			<pathelement location="../org.eclipse.tomcat/jakarta-commons-logging.jar" />  
+ 		</path>
+ 		<delete dir="${temp.folder}/jsp.jar.src"/>
+   		<mkdir dir="${temp.folder}/jsp.jar.src"/>
+@@ -168,7 +171,6 @@
+ 			failonerror="false"
+ 			classpathref="jasper.classpath"
+ 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">
+-			<arg value="-v3" />
+ 			<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
+ 			<arg value="-die" />
+ 			<arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>
+@@ -202,7 +204,8 @@
+ 				<pathelement path="../org.eclipse.help"/>
+ 				<pathelement path="../org.eclipse.help.base"/>
+ 				<pathelement path="../org.eclipse.help.appserver"/>
+-				<pathelement path="../org.eclipse.tomcat/servlet.jar"/>
++				<pathelement path="../org.eclipse.tomcat/servletapi5.jar"/>
+ 				<pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
++				<pathelement path="../org.eclipse.tomcat/jspapi.jar"/>
+ 			</classpath>
+ 			<src path="${temp.folder}/jsp.jar.src/"			/>


--- eclipse-icon.patch DELETED ---