From 4b28c69fb7c7b95dd7714e229159627320fbed1d Mon Sep 17 00:00:00 2001
From: Andrew Overholt <overholt@fedoraproject.org>
Date: Aug 17 2006 18:26:52 +0000
Subject: - Fix tomcat55 patch to not conflict with wst.ws (commons-logging

    visibility).

---

diff --git a/eclipse-tomcat55.patch b/eclipse-tomcat55.patch
index 4152d47..a63fbd1 100644
--- a/eclipse-tomcat55.patch
+++ b/eclipse-tomcat55.patch
@@ -1524,12 +1524,11 @@ diff -u -r1.21 MANIFEST.MF
  Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin
  Bundle-Vendor: %providerName
  Bundle-Localization: plugin
-@@ -33,6 +35,74 @@
+@@ -33,6 +35,73 @@
   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
 -Export-Package: org.eclipse.tomcat.internal;x-internal:=true,
-+Eclipse-BuddyPolicy: global
 +Export-Package: javax.management;x-internal:=true,
 + javax.management.loading;x-internal:=true,
 + javax.management.modelmbean;x-internal:=true,
diff --git a/eclipse.spec b/eclipse.spec
index 851820a..3caa3bd 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -41,7 +41,7 @@ Epoch:	1
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1jpp_11fc
+Release:        1jpp_12fc
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1641,6 +1641,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 17 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_12fc
+- Fix tomcat55 patch to not conflict with wst.ws (commons-logging visibility).
+
 * Thu Aug 10 2006 Andrew Overholt <overholt@redhat.com> 3.2.0-1jpp_11fc
 - Fix eclipse-tomcat55.patch and eclipse-tomcat55-build.patch to not reference
   jars that don't exist.