[eclipse/f16] - (Re-apply) Upgrade to Tomcat 7 Jasper. - Include org.eclipse.jdt.core as part of platform to avoid

[Roland Grunberg]

commit 4905fd3ca7d7c5661c7d80c6eff35057d8fddc63
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Mon Nov 28 09:39:53 2011 -0500

    - (Re-apply) Upgrade to Tomcat 7 Jasper.
    - Include org.eclipse.jdt.core as part of platform to avoid cyclic
      dependency between platform and jdt.

 eclipse.spec |   24 +++++++++++++++---------
 sources      |    2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 799d9b8..1b3d5ed 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -23,11 +23,11 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:        %{download_url}eclipse-build-de0fa989dbe8ac96ffa5069829f2088b2714a38c.tar.xz
+Source0:        %{download_url}eclipse-build-f3a334f06fdab6056ad27bcb542be3bec10ce607.tar.xz
 Source1:        %{download_url}eclipse-3.7.1-src.tar.bz2
 
 BuildRequires:  ant
@@ -51,9 +51,7 @@ BuildRequires:  xulrunner-devel
 BuildRequires:  webkitgtk-devel
 
 BuildRequires: icu4j-eclipse >= 1:4.4.2-2
-BuildRequires: tomcat5-jasper-eclipse >= 5.5.31-2
-BuildRequires: tomcat6-servlet-2.5-api >= 6.0.32-8
-BuildRequires: tomcat6-jsp-2.1-api
+BuildRequires: tomcat-lib >= 7.0.22-2
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
 BuildRequires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf
 BuildRequires: jsch >= 0:0.1.41
@@ -115,9 +113,7 @@ Requires: ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant
 Requires: apache-commons-el 
 Requires: apache-commons-logging 
 Requires: apache-commons-codec
-Requires: tomcat5-jasper-eclipse >= 5.5.31-2
-Requires: tomcat6-servlet-2.5-api >= 6.0.32-8
-Requires: tomcat6-jsp-2.1-api
+Requires: tomcat-lib >= 7.0.22-2
 Requires: jetty >= 6.1.24-1
 Requires: jsch >= 0.1.41
 Requires: lucene >= 2.9.4-5
@@ -165,7 +161,7 @@ Eclipse Plugin Development Environment.  This package is required for
 developing Eclipse plugins.
 
 %prep
-%setup -q -n eclipse-build-de0fa989dbe8ac96ffa5069829f2088b2714a38c
+%setup -q -n eclipse-build-f3a334f06fdab6056ad27bcb542be3bec10ce607
 cp %{SOURCE1} .
 ant -DbuildArch=%{eclipse_arch} applyPatches
 pushd build/eclipse-3.7.1-src
@@ -407,8 +403,13 @@ rm -rf %{_bindir}/efj/
 %dir %{_datadir}/%{name}/dropins
 %{_libdir}/%{name}/features/org.eclipse.platform_*
 %{_libdir}/%{name}/plugins/com.jcraft.jsch_*
+%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*
 %{_libdir}/%{name}/plugins/javax.servlet_*
 %{_libdir}/%{name}/plugins/javax.servlet.jsp_*
+%{_libdir}/%{name}/plugins/javax.el_*
+%{_libdir}/%{name}/plugins/org.apache.tomcat_*
+%{_libdir}/%{name}/plugins/org.apache.juli_*
+%{_libdir}/%{name}/plugins/org.apache.el_*
 %{_libdir}/%{name}/plugins/org.apache.ant_*
 %{_libdir}/%{name}/plugins/org.apache.commons.el_*
 %{_libdir}/%{name}/plugins/org.apache.commons.logging_*
@@ -554,6 +555,11 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Mon Nov 28 2011 Roland Grunberg <rgrunber at redhat.com> 1:3.7.1-6
+- (Re-apply) Upgrade to Tomcat 7 Jasper.
+- Include org.eclipse.jdt.core as part of platform to avoid cyclic
+  dependency between platform and jdt.
+
 * Fri Nov 25 2011 Alexander Kurtakov <akurtako at redhat.com> 1:3.7.1-5
 - Add ExclusiveArch for RHEL.
 
diff --git a/sources b/sources
index c0b2b4f..c0b4e7a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 e93946a256ba9bf468fc1588aab60e20  eclipse-3.7.1-src.tar.bz2
-c990324c206624e4398bc115da92b30e  eclipse-build-de0fa989dbe8ac96ffa5069829f2088b2714a38c.tar.xz
+457c561424c1696d47fedd7290f61d39  eclipse-build-f3a334f06fdab6056ad27bcb542be3bec10ce607.tar.xz