From 6852bd17ddbfc15d86df775466b321e041be448d Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Aug 10 2006 19:24:51 +0000
Subject: - Fix eclipse-tomcat55.patch and eclipse-tomcat55-build.patch to not

    reference jars that don't exist.
- Fix rebuild-sdk-features to work with 3.2.x feature versions.

---

diff --git a/eclipse-tomcat55-build.patch b/eclipse-tomcat55-build.patch
index d542761..d049aa5 100644
--- a/eclipse-tomcat55-build.patch
+++ b/eclipse-tomcat55-build.patch
@@ -78,8 +78,8 @@
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-impl.jar"/>
 +			<pathelement path="lib/mx4j-jmx.jar"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/mx4j-jmx.jar"/>
-+			<pathelement path="lib/jsp-api.jar"/>
-+			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jsp-api.jar"/>
++			<pathelement path="lib/jspapi.jar"/>
++			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/jspapi.jar"/>
 +			<pathelement path="lib/naming-factory.jar"/>
 +			<pathelement path="${build.result.folder}/../org.eclipse.tomcat/lib/naming-factory.jar"/>
 +			<pathelement path="lib/naming-resources.jar"/>
diff --git a/eclipse-tomcat55.patch b/eclipse-tomcat55.patch
index 68c9288..4152d47 100644
--- a/eclipse-tomcat55.patch
+++ b/eclipse-tomcat55.patch
@@ -5,7 +5,7 @@ retrieving revision 1.21
 diff -u -r1.21 .classpath
 --- .classpath	9 May 2006 18:51:41 -0000	1.21
 +++ .classpath	4 Jul 2006 18:42:40 -0000
-@@ -1,28 +1,27 @@
+@@ -1,28 +1,29 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
  	<classpathentry kind="src" path="src"/>
@@ -35,11 +35,13 @@ diff -u -r1.21 .classpath
 +	<classpathentry exported="true" kind="lib" path="lib/catalina-optional.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-el.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/commons-modeler.jar"/>
-+	<classpathentry exported="true" kind="lib" path="lib/jmx.jar"/>
-+	<classpathentry exported="true" kind="lib" path="lib/jsp-api.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/mx4j.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/mx4j-jmx.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/mx4j-impl.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/jspapi.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/naming-factory.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/naming-resources.jar"/>
-+	<classpathentry exported="true" kind="lib" path="lib/servlet-api.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/servletapi5.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/servlets-default.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/tomcat-coyote.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/tomcat-http.jar"/>
@@ -1466,7 +1468,7 @@ retrieving revision 1.21
 diff -u -r1.21 MANIFEST.MF
 --- META-INF/MANIFEST.MF	9 May 2006 20:26:52 -0000	1.21
 +++ META-INF/MANIFEST.MF	4 Jul 2006 18:42:40 -0000
-@@ -2,30 +2,30 @@
+@@ -2,30 +2,32 @@
  Bundle-ManifestVersion: 2
  Bundle-Name: %pluginName
  Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true
@@ -1506,12 +1508,14 @@ diff -u -r1.21 MANIFEST.MF
 + lib/commons-modeler.jar,
 + lib/jasper-compiler.jar,
 + lib/jasper-runtime.jar,
-+ lib/jmx.jar,
-+ lib/jsp-api.jar,
++ lib/mx4j.jar,
++ lib/mx4j-jmx.jar,
++ lib/mx4j-impl.jar,
++ lib/jspapi.jar,
 + lib/naming-factory.jar,
 + lib/naming-resources.jar,
 + lib/regexp.jar,
-+ lib/servlet-api.jar,
++ lib/servletapi5.jar,
 + lib/servlets-default.jar,
 + lib/tomcat-coyote.jar,
 + lib/tomcat-http.jar,
@@ -1520,7 +1524,7 @@ diff -u -r1.21 MANIFEST.MF
  Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
  Bundle-Vendor: %providerName
  Bundle-Localization: plugin
-@@ -33,6 +33,74 @@
+@@ -33,6 +35,74 @@
   org.apache.ant;bundle-version="[1.6.5,1.7.0)";resolution:=optional,
   org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
  Eclipse-LazyStart: true
diff --git a/eclipse.spec b/eclipse.spec
index bd51a2d..7243c81 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1641,6 +1641,11 @@ fi
 %endif
 
 %changelog
+* Thu Aug 10 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_1rh
+- Fix eclipse-tomcat55.patch and eclipse-tomcat55-build.patch to not reference
+  jars that don't exist.
+- Fix rebuild-sdk-features to work with 3.2.x feature versions.
+
 * Tue Aug 01 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_10fc
 - Use firefox-devel instead of mozilla-devel.
 - Add patch for rh#200929 (include embed_base in xpcom's pkgconfig -I flags).