[eclipse-wtp-sourceediting] Include org.eclipse.wst.xsl.feature

[Vladimir Kostadinov]

commit b396fd0ce8502a217e6013b344d0ad58ff0b9e7b
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Mon Jun 25 21:22:57 2012 +0100

    Include org.eclipse.wst.xsl.feature

 ...-wst.xsl-rm-commons.logging-version-check.patch |   11 +++
 eclipse-wtp-sourceediting.spec                     |   72 ++++++++++++++++++--
 2 files changed, 78 insertions(+), 5 deletions(-)
---
diff --git a/eclipse-wtp-sourceediting-wst.xsl-rm-commons.logging-version-check.patch b/eclipse-wtp-sourceediting-wst.xsl-rm-commons.logging-version-check.patch
new file mode 100644
index 0000000..4c240a1
--- /dev/null
+++ b/eclipse-wtp-sourceediting-wst.xsl-rm-commons.logging-version-check.patch
@@ -0,0 +1,11 @@
+--- org.eclipse.wst.xsl.feature/feature.xml.orig	2012-06-24 13:39:47.295370041 +0100
++++ org.eclipse.wst.xsl.feature/feature.xml	2012-06-24 13:40:18.449773457 +0100
+@@ -81,7 +81,7 @@
+          id="org.apache.commons.logging"
+          download-size="0"
+          install-size="0"
+-         version="1.0.4.qualifier"
++         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
diff --git a/eclipse-wtp-sourceediting.spec b/eclipse-wtp-sourceediting.spec
index 1ebc5f3..ddd6924 100644
--- a/eclipse-wtp-sourceediting.spec
+++ b/eclipse-wtp-sourceediting.spec
@@ -1,9 +1,9 @@
 %global eclipse_base	%{_libdir}/eclipse
-%global install_loc		%{_datadir}/eclipse/dropins/wtp-sourceediting
+%global install_loc	%{_datadir}/eclipse/dropins/wtp-sourceediting
 
 Name:			eclipse-wtp-sourceediting
 Version:		3.4.0
-Release:		0.1.M6%{?dist}
+Release:		0.2.M6%{?dist}
 Summary:		WTP Source Editing
 
 Group:			Development/Tools
@@ -17,32 +17,60 @@ BuildArch: noarch
 
 Patch1:			xml-core-feature.patch
 Patch2:			xml-core.patch
-Patch3:         fix-jsdt.patch
+Patch3:			fix-jsdt.patch
+Patch4:			%{name}-wst.xsl-rm-commons.logging-version-check.patch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
 
 BuildRequires: eclipse-platform >= 1:3.7.0
 BuildRequires: eclipse-pde >= 1:3.7.0
 BuildRequires: eclipse-emf >= 2.6.0
 BuildRequires: eclipse-emf-xsd >= 2.6.0
+BuildRequires: eclipse-emf-core >= 2.8.0
 BuildRequires: eclipse-gef >= 3.7.0
 BuildRequires: eclipse-wtp-common >= 3.3.1
+BuildRequires: eclipse-rcp >= 4.2.0
+BuildRequires: eclipse-swt >= 4.2.0
+BuildRequires: eclipse-jdt >= 4.2.0
+BuildRequires: icu4j-eclipse >= 1:4.4.2.2
 
+BuildRequires: ant >= 1.8.3
 BuildRequires: xerces-j2 >= 2.11.0
-BuildRequires: xalan-j2 >= 2.7.1
+BuildRequires: xalan-j2 >= 2.7.1-10
 BuildRequires: xml-commons-apis >= 1.3.4
 BuildRequires: xml-commons-resolver >= 1.2
 BuildRequires: rhino >= 1.7-0.9.r2
+BuildRequires: java_cup >= 1:0.11a-8
+BuildRequires: bcel >= 5.1-11
+BuildRequires: glassfish-jsp-api >= 2.2.1
+BuildRequires: apache-commons-logging >= 1.1.1
+BuildRequires: log4j >= 1.2.17-2
+
+Requires: java
+Requires: jpackage-utils
 
 Requires: eclipse-platform >= 1:3.7.0
 Requires: eclipse-emf >= 2.6.0
 Requires: eclipse-emf-xsd >= 2.6.0
+Requires: eclipse-emf-core >= 2.8.0
 Requires: eclipse-gef >= 3.7.0
 Requires: eclipse-wtp-common >= 3.3.1
+Requires: eclipse-rcp >= 4.2.0
+Requires: eclipse-swt >= 4.2.0
+Requires: eclipse-jdt >= 4.2.0
+Requires: icu4j-eclipse >= 1:4.4.2.2
 
+Requires: ant >= 1.8.3
 Requires: xerces-j2 >= 2.11.0
-Requires: xalan-j2 >= 2.7.1
+Requires: xalan-j2 >= 2.7.1-10
 Requires: xml-commons-apis >= 1.3.4
 Requires: xml-commons-resolver >= 1.2
 Requires: rhino >= 1.7-0.9.r2
+Requires: java_cup >= 1:0.11a-8
+Requires: bcel >= 5.1-11
+Requires: glassfish-jsp-api >= 2.2.1
+Requires: log4j >= 1.2.17-2
 
 
 %description
@@ -58,10 +86,16 @@ rm -rf orbit
 mkdir orbit
 pushd orbit
 %{__ln_s} %{_javadir}/xalan-j2-serializer.jar
+%{__ln_s} %{_javadir}/xalan-j2.jar
 %{__ln_s} %{_javadir}/xerces-j2.jar
 %{__ln_s} %{_javadir}/xml-commons-apis.jar
 %{__ln_s} %{_javadir}/xml-resolver.jar
 %{__ln_s} %{_javadir}/rhino.jar
+%{__ln_s} %{_javadir}/apache-commons-discovery.jar
+%{__ln_s} %{_javadir}/apache-commons-logging.jar
+%{__ln_s} %{_javadir}/bcel.jar
+%{__ln_s} %{_javadir}/java_cup-runtime.jar
+%{__ln_s} %{_javadir}/log4j.jar
 popd
 
 #Patch XML_CORE feature.xml xerces version
@@ -73,6 +107,9 @@ popd
 #Add dependency to jsdt (it needs the xml_ui to be built first_
 %patch3
 
+#Remove old version check for org.apache.commons.logging
+%patch4
+
 #Remove license attributes from feature.xml
 find -name feature.xml -exec sed -i -e 's/license-feature.*"//' '{}' \;
 
@@ -81,11 +118,18 @@ eclipse-pdebuild -f org.eclipse.wst.web_ui.feature \
 	-d "xsd emf gef eclipse-wtp-common" \
 	-o `pwd`/orbit
 
+eclipse-pdebuild -f org.eclipse.wst.xsl.feature \
+	-d "xsd emf gef eclipse-wtp-common" \
+	-o `pwd`/orbit
+
+
 %install
 install -d -m 755 %{buildroot}%{install_loc}
 
 %{__unzip} -q -d %{buildroot}%{install_loc} \
      build/rpmBuild/org.eclipse.wst.web_ui.feature.zip
+%{__unzip} -q -o -d %{buildroot}%{install_loc} \
+     build/rpmBuild/org.eclipse.wst.xsl.feature.zip
 
 #Recreate symlinks & remove duplicate jars
 pushd %{buildroot}%{install_loc}/eclipse/plugins
@@ -94,16 +138,31 @@ rm -f org.apache.xerces*.jar
 rm -f javax.xml*.jar
 rm -f org.apache.xml.resolver*.jar
 rm -f org.mozilla.javascript*.jar
+rm -f java_cup.runtime_*.jar
+rm -f org.apache.bcel_*.jar
+rm -f org.apache.commons.logging_*.jar
+rm -f org.apache.xalan_*.jar
+rm -f org.apache.log4j_*.jar
 
 #Remove duplicates because of improper including
 rm -f org.eclipse.jem.util*.jar
 rm -f org.eclipse.wst.common.*.jar
+rm -f org.eclipse.wst.internet.cache_*.jar
+rm -f org.eclipse.wst.validation_*.jar
+rm -f org.eclipse.wst.validation.infopop_*.jar
+rm -f org.eclipse.wst.validation.ui_*.jar
 
 %{__ln_s} %{_javadir}/xalan-j2-serializer.jar
 %{__ln_s} %{_javadir}/xerces-j2.jar
 %{__ln_s} %{_javadir}/xml-commons-apis.jar
 %{__ln_s} %{_javadir}/xml-resolver.jar
 %{__ln_s} %{_javadir}/rhino.jar
+%{__ln_s} %{_javadir}/java_cup-runtime.jar
+%{__ln_s} %{_javadir}/bcel.jar
+%{__ln_s} %{_javadir}/apache-commons-logging.jar
+%{__ln_s} %{_javadir}/xalan-j2.jar
+%{__ln_s} %{_javadir}/log4j.jar
+
 popd
 
 %files
@@ -111,6 +170,9 @@ popd
 %doc org.eclipse.wst.doc.user/about.html
 
 %changelog
+* Sun Jun 24 2012 Gerard Ryan <galileo at fedoraproject.org> 3.4.0-0.2.M6
+- Include org.eclipse.wst.xsl.feature.
+
 * Fri Apr 27 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.4.0-0.1.M6
 - Update to latest upstream revision (3.4.0 post M6)