From 4ee5c9a41238438f0593ab24fbe32e4f9855b262 Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Mar 07 2006 13:43:44 +0000
Subject: s/jakarta-regexp/regexp-1.3/g


---

diff --git a/eclipse-tomcat55-build.patch b/eclipse-tomcat55-build.patch
index 086fec3..3e43550 100644
--- a/eclipse-tomcat55-build.patch
+++ b/eclipse-tomcat55-build.patch
@@ -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"/>
diff --git a/eclipse.spec b/eclipse.spec
index 9fbdf8b..f0e106e 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -499,6 +499,7 @@ rm -f plugins/org.apache.lucene/lucene-1.4.3-src.zip
 # 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 @@ rm -f plugins/org.apache.lucene_*/lucene-1.4.3-src.zip
 # 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