[eclipse-cdt] Remove org.apache.xerces and org.cyberneko.html plugins from installation

[Jeff Johnston]

commit 8b9117dcc20143c2c0a9155c22efeaf85b28f20f
Author: jjohnstn <jjohnstn at redhat.com>
Date:   Thu May 15 14:11:43 2014 -0400

    Remove org.apache.xerces and org.cyberneko.html plugins from installation
    
      and link to jars from Fedora packages

 eclipse-cdt.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 4cc19d2..f58dee0 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -31,7 +31,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           %{?scl_prefix}eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.1.git20140506%{?dist}
+Release:        0.2.git20140506%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -320,6 +320,15 @@ done
 # Remove lpgjavaruntime jar file
 rm -rf $installDir/eclipse/plugins/net.sourceforge.*
 
+pushd $installDir/eclipse/plugins
+XERCES_JAR=`ls org.apache.xerces*`
+CYBERNEKO_JAR=`ls org.cyberneko.html*`
+rm $XERCES_JAR
+rm $CYBERNEKO_JAR
+ln -s /usr/share/java/nekohtml.jar $CYBERNEKO_JAR
+ln -s /usr/share/java/xerces-j2.jar $XERCES_JAR
+popd
+
 # Move upc, xlc, and lrparser plugins/features to parsers install area.
 mkdir -p $parsersInstallDir/eclipse/features $parsersInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*xlc* $parsersInstallDir/eclipse/features
@@ -379,6 +388,10 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Thu May 15 2014 Jeff Johnston <jjohnstn at redhat.com> 1:8.4.0-0.2.git20140506
+- Remove org.apache.xerces and org.cyberneko.html plugins from installation
+  and link to jars from Fedora packages
+
 * Tue May 13 2014 Jeff Johnston <jjohnstn at redhat.com> 1:8.4.0-0.1.git20140506
 - Update CDT to 8.4.0 Luna M7 build
 - Update Libhover to Linux Tools 3.0 Luna M7 build