From b6e946a4a725d6ed807410f8c977a409bae6fe23 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Fri, 1 Mar 2013 14:59:57 +0100 Subject: [PATCH] remove all org.w3c.css --- eclipse-fix-linkageerrors-in-ui.patch | 66 +++++++++++++++++++++++++++ eclipse.spec | 5 +- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/eclipse-fix-linkageerrors-in-ui.patch b/eclipse-fix-linkageerrors-in-ui.patch index db08bca..ee42b23 100644 --- a/eclipse-fix-linkageerrors-in-ui.patch +++ b/eclipse-fix-linkageerrors-in-ui.patch @@ -54,3 +54,69 @@ - org.osgi.service.event;version="1.3.0";resolution:=optional, - org.w3c.dom.css;version="2.0.0" + org.osgi.service.event;version="1.3.0";resolution:=optional +--- eclipse.platform.ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF.bak 2013-02-20 13:31:04.000000000 +0100 ++++ eclipse.platform.ua/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF 2013-03-01 14:34:05.457311220 +0100 +@@ -30,7 +30,6 @@ + Eclipse-LazyStart: true + Import-Package: com.ibm.icu.text, + javax.xml.parsers, +- org.w3c.dom, + org.xml.sax + Bundle-RequiredExecutionEnvironment: J2SE-1.4 + Bundle-ActivationPolicy: lazy +--- eclipse.platform.ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF.bak 2013-02-20 13:31:05.000000000 +0100 ++++ eclipse.platform.ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF 2013-03-01 14:35:16.665923987 +0100 +@@ -31,6 +31,5 @@ + javax.xml.transform, + javax.xml.transform.dom, + javax.xml.transform.stream, +- org.w3c.dom, + org.xml.sax + Bundle-ActivationPolicy: lazy +--- eclipse.platform.ua/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF.bak 2013-02-20 13:31:04.000000000 +0100 ++++ eclipse.platform.ua/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF 2013-03-01 14:36:26.560525212 +0100 +@@ -18,7 +18,6 @@ + Bundle-ClassPath: universal.jar + Bundle-RequiredExecutionEnvironment: J2SE-1.4 + Import-Package: javax.xml.parsers, +- org.w3c.dom, + org.xml.sax + Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.ui.internal.intro.universal.contentdetect" + Eclipse-BundleShape: dir +--- eclipse.platform.ua/org.eclipse.help/META-INF/MANIFEST.MF.bak 2013-02-20 13:31:04.000000000 +0100 ++++ eclipse.platform.ua/org.eclipse.help/META-INF/MANIFEST.MF 2013-03-01 14:37:18.854974896 +0100 +@@ -64,7 +64,6 @@ + javax.xml.transform, + javax.xml.transform.dom, + javax.xml.transform.stream, +- org.w3c.dom, + org.xml.sax, + org.xml.sax.helpers + Bundle-RequiredExecutionEnvironment: J2SE-1.4, +--- eclipse.platform.ui/bundles/org.eclipse.ui.forms/META-INF/MANIFEST.MF.bak 2013-02-20 13:33:11.000000000 +0100 ++++ eclipse.platform.ui/bundles/org.eclipse.ui.forms/META-INF/MANIFEST.MF 2013-03-01 14:38:20.414504094 +0100 +@@ -17,7 +17,6 @@ + Eclipse-LazyStart: true + Import-Package: com.ibm.icu.text, + javax.xml.parsers, +- org.w3c.dom, + org.xml.sax + Bundle-RequiredExecutionEnvironment: J2SE-1.4 + Bundle-ActivationPolicy: lazy +--- eclipse.platform.ui/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF.bak 2013-02-20 13:33:11.000000000 +0100 ++++ eclipse.platform.ui/bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF 2013-03-01 14:40:26.279585588 +0100 +@@ -124,7 +124,5 @@ + org.eclipse.emf.ecore, + org.eclipse.emf.ecore.util, + org.osgi.service.event;version="1.2.0", +- org.w3c.dom, +- org.w3c.dom.css;version="2.0.0", + org.xml.sax + Bundle-RequiredExecutionEnvironment: J2SE-1.5 +--- eclipse.platform.runtime/bundles/org.eclipse.core.expressions/META-INF/MANIFEST.MF.bak 2013-02-20 13:23:25.000000000 +0100 ++++ eclipse.platform.runtime/bundles/org.eclipse.core.expressions/META-INF/MANIFEST.MF 2013-03-01 14:41:31.345144407 +0100 +@@ -16,4 +16,3 @@ + Bundle-RequiredExecutionEnvironment: J2SE-1.4, + CDC-1.0/Foundation-1.0, + J2SE-1.3 +-Import-Package: org.w3c.dom diff --git a/eclipse.spec b/eclipse.spec index db4c69f..45c327b 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -65,7 +65,7 @@ fi; Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 2%{?dist} +Release: 3%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -1334,6 +1334,9 @@ rm -rf %{_bindir}/efj/ %{_mavendepmapfragdir}/%{name}-equinox-osgi %changelog +* Fri Mar 1 2013 Krzysztof Daniel 1:4.2.2-3 +- Use org.w3c.dom version provided by JVM in all ui bundles. + * Wed Feb 27 2013 Krzysztof Daniel 1:4.2.2-2 - Fix the /usr/lib/java/swt.jar symlink.