Use glassfish-jsp-api instead of tomcat-jsp-api.

Conflicts:
	eclipse.spec

eclipse.spec

@@ -78,7 +78,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -288,7 +288,7 @@ BuildRequires: tycho-extras >= 0.16
 BuildRequires: eclipse-emf-core >= 1:2.8.1
 BuildRequires: eclipse-ecf-core
 BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: tomcat-jsp-2.2-api
+BuildRequires: glassfish-jsp-api >= 2.2.1-4
 BuildRequires: cglib
 BuildRequires: glassfish-jsp >= 2.2.6
 %if %{bootstrap} != 1
@@ -358,7 +358,7 @@ Requires: geronimo-annotation >= 1.0-7
 Requires: eclipse-ecf-core
 Requires: eclipse-emf-core >= 2.8.1
 Requires: tomcat-servlet-3.0-api
-Requires: tomcat-jsp-2.2-api
+Requires: glassfish-jsp-api >= 2.2.1-4
 Requires: glassfish-jsp >= 2.2.5
 Requires: icu4j-eclipse >= 1:4.4.2.2-11
 Requires: eclipse-swt = %{epoch}:%{eclipse_version}-%{release}
@@ -730,7 +730,7 @@ pushd plugins
 %_symlink javax.el_ tomcat-el-api.jar
 %_symlink javax.inject_ atinject.jar
 %_symlink javax.servlet_ tomcat-servlet-api.jar
-%_symlink javax.servlet.jsp_ tomcat-jsp-api.jar
+%_symlink javax.servlet.jsp_ glassfish-jsp-api.jar
 %_symlink javax.xml_ xml-commons-apis.jar
 %_symlink org.apache.batik.css_ batik/batik-css.jar
 %_symlink org.apache.batik.util_ batik/batik-util.jar
@@ -1409,6 +1409,9 @@ rm -rf %{_bindir}/efj/
 %{_mavendepmapfragdir}/%{name}-equinox-osgi
 
 %changelog
+* Fri Oct 19 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-4
+- Use glassfish-jsp-api instead of tomcat-jsp-api.
+
 * Fri Oct 5 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-3
 - Bootstrap build.
 - Support for secondary architectures.