rpms/eclipse/devel eclipse-tomcat55-build.patch, 1.3, 1.4 eclipse.spec, 1.261, 1.262

[fedora-cvs-commits at redhat.com]

Author: overholt

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

Modified Files:
	eclipse-tomcat55-build.patch eclipse.spec 
Log Message:
s/jakarta-regexp/regexp-1.3/g

eclipse-tomcat55-build.patch:
 build.xml |   76 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 48 insertions(+), 28 deletions(-)

Index: eclipse-tomcat55-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eclipse-tomcat55-build.patch	6 Mar 2006 21:47:41 -0000	1.3
+++ eclipse-tomcat55-build.patch	7 Mar 2006 13:43:44 -0000	1.4
@@ -73,8 +73,8 @@
  				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/naming-resources.jar"/>
 -				<pathelement path="servlet.jar"/>
 -				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servlet.jar"/>
-+				<pathelement path="regexp.jar"/>
-+				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/regexp.jar"/>
++				<pathelement path="regexp-1.3.jar"/>
++				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/regexp-1.3.jar"/>
 +				<pathelement path="servletapi5.jar"/>
 +				<pathelement path="${build.result.folder}/../org.eclipse.tomcat/servletapi5.jar"/>
  				<pathelement path="servlets-common.jar"/>


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- eclipse.spec	7 Mar 2006 04:33:20 -0000	1.261
+++ eclipse.spec	7 Mar 2006 13:43:44 -0000	1.262
@@ -499,6 +499,7 @@
 # END LUCENE ##
 ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar
 ## BEGIN TOMCAT ##
+rm -f plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar
 rm -f plugins/org.eclipse.tomcat/servlet.jar
 rm -f plugins/org.eclipse.tomcat/servlets-manager.jar
 rm -f plugins/org.eclipse.tomcat/naming-common.jar
@@ -875,6 +876,7 @@
 # END LUCENE ##
 ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar
 ## BEGIN TOMCAT ##
+rm -f plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar
 rm -f plugins/org.eclipse.tomcat_*/servlet.jar
 rm -f plugins/org.eclipse.tomcat_*/servlets-manager.jar
 rm -f plugins/org.eclipse.tomcat_*/naming-common.jar