[eclipse/f18] Restore javax.xml.

Krzysztof Daniel kdaniel at fedoraproject.org
Mon Nov 26 11:18:35 UTC 2012


commit 1256696a9c149c18a5bf579e8bd89cf936e7f168
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Nov 26 12:00:02 2012 +0100

    Restore javax.xml.
    
    Changes to remove the javax.xml must be done across the entire Eclipse
    and java stack. Unfortunately, removing the javax.xml in Eclipse breaks
    other bundles in too many places preventing Eclipse from discovering
    bundles in dropins or even starting. This should not be done in f18.

 eclipse-remove-javaxxml.patch |   17 -----------------
 eclipse.spec                  |    5 +++--
 2 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 5cd92f0..9c3a0ed 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -65,7 +65,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        19%{?dist}
+Release:        20%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -425,7 +425,6 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch35
 %patch36
 %patch37
-%patch38
 
 #p2.inf should be qualified (asked in the newsgroup and waiting for an answer)
 #http://dev.eclipse.org/mhonarc/lists/cbi-dev/msg00777.html
@@ -652,6 +651,7 @@ pushd plugins
 %_symlink com.ibm.icu_ icu4j-eclipse/plugins/com.ibm.icu_*.jar
 %_symlink com.jcraft.jsch_ jsch.jar 
 %_symlink javax.el_ tomcat-el-api.jar
+%_symlink javax.xml_ xml-commons-apis.jar
 %_symlink javax.inject_ atinject.jar
 %_symlink javax.servlet_ tomcat-servlet-api.jar
 %_symlink javax.servlet.jsp_ glassfish-jsp-api.jar
@@ -1112,6 +1112,7 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/plugins/com.jcraft.jsch_*
 %{_libdir}/%{name}/plugins/javax.servlet_*
 %{_libdir}/%{name}/plugins/javax.servlet.jsp_*
+%{_libdir}/%{name}/plugins/javax.xml_*
 %{_libdir}/%{name}/plugins/javax.el_*
 %{_libdir}/%{name}/plugins/javax.inject_*.jar
 %{_libdir}/%{name}/plugins/org.apache.ant_*


More information about the scm-commits mailing list