diff --git a/eclipse-fix-equinox-ip-imports.patch b/eclipse-fix-equinox-ip-imports.patch new file mode 100644 index 0000000..559e61a --- /dev/null +++ b/eclipse-fix-equinox-ip-imports.patch @@ -0,0 +1,17 @@ +--- rt.equinox.bundles/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF.bak 2012-07-25 17:41:27.000000000 +0200 ++++ rt.equinox.bundles/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF 2012-07-27 12:30:04.415050626 +0200 +@@ -9,8 +9,6 @@ + Bundle-Activator: org.eclipse.equinox.internal.ip.impl.ProvisioningAgent + DynamicImport-Package: org.osgi.service.permissionadmin; version="1.0" + Import-Package: +- javax.servlet;version="2.1", +- javax.servlet.http;version="2.1", + org.eclipse.equinox.internal.util.ref;version="1.0", + org.eclipse.equinox.internal.util.timer;version="1.0", + org.osgi.framework;version="1.0", +@@ -39,4 +37,5 @@ + Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, + J2SE-1.3 + Bundle-Localization: plugin ++Require-Bundle: javax.servlet;bundle-version="3.0.0" + diff --git a/eclipse.spec b/eclipse.spec index 8047419..c21f0e6 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -65,6 +65,7 @@ Patch3: %{name}-fix-icu-import.patch Patch4: %{name}-no-source-for-dependencies.patch Patch5: %{name}-osgi-serverside-patch-additional-imports.patch Patch6: %{name}-fix-sshd-id.patch +Patch7: %{name}-fix-equinox-ip-imports.patch BuildRequires: ant >= 1.8.3 BuildRequires: rsync @@ -246,6 +247,7 @@ developing Eclipse plugins. %patch4 %patch5 %patch6 +%patch7 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040 %pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .