From 5e366bf9c6096827bac64fe8157ab08548fb64af Mon Sep 17 00:00:00 2001
From: akurtakov <akurtakov@localhost.localdomain>
Date: Sep 21 2010 09:08:47 +0000
Subject: - Add jsp-api dependency and use the tomcat6 one.


---

diff --git a/eclipse.spec b/eclipse.spec
index b0f661a..d536b63 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,7 +27,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -66,9 +66,10 @@ BuildRequires:  xulrunner-devel >= 1.9.3
 BuildRequires:  webkitgtk-devel
 
 %if !%{bootstrap}
-BuildRequires:  icu4j-eclipse >= 1:4.2.1-1
-BuildRequires:  tomcat5-jasper-eclipse >= 5.5.27-6.3
-BuildRequires:  tomcat6-servlet-2.5-api >= 6.0.18-9.2
+BuildRequires: icu4j-eclipse >= 1:4.2.1-1
+BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3
+BuildRequires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
+BuildRequires: tomcat6-jsp-2.1-api
 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
 BuildRequires: jsch >= 0:0.1.41
@@ -132,6 +133,7 @@ Requires: apache-commons-logging >= 1.0.4-6jpp.3
 Requires: apache-commons-codec
 Requires: tomcat5-jasper-eclipse >= 5.5.27-6.3
 Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.2
+Requires: tomcat6-jsp-2.1-api
 Requires: jetty >= 6.1.24-1
 Requires: jsch >= 0.1.41
 Requires: lucene >= 2.3.1-3.4
@@ -187,6 +189,7 @@ developing Eclipse plugins.
 cp %{SOURCE1} .
 ant -DbuildArch=%{eclipse_arch} applyPatches
 sed -i -e "s|org.apache.ant_1.7.1.v20100518-1145/lib/ant-trax.jar=/usr/share/java/ant/ant-trax.jar:/usr/share/java/ant-trax.jar||g" nonosgidependencies.properties
+sed -i -e "s|tomcat5-jsp-2.0-api|tomcat6-jsp-2.1-api|g" dependencies.properties
 pushd build/eclipse-%{version}-src
 %patch0
 pushd plugins/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/library/
@@ -591,6 +594,9 @@ fi
 %{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Tue Sep 21 2010 Alexander Kurtakov <akurtako@redhat.com> 1:3.6.0-11
+- Add jsp-api dependency and use the tomcat6 one.
+
 * Fri Sep 17 2010 Jeff Johnston <jjohnstn@redhat.com> 1:3.6.0-10
 - Add patch to fix xpcom problem.