diff --git a/eclipse.spec b/eclipse.spec index 75716ce..97935e4 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -20,7 +20,7 @@ Release: 2%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: %{download_url}eclipse-build-e72072bac3d127680aee62b8b56082400c07ff27.tar.xz +Source0: %{download_url}eclipse-build-de0fa989dbe8ac96ffa5069829f2088b2714a38c.tar.xz Source1: %{download_url}eclipse-3.7.1-src.tar.bz2 Source2: eclipse-reconciler.sh Source3: %{name}-tmpfiles.conf @@ -47,7 +47,9 @@ BuildRequires: libXt-devel BuildRequires: webkitgtk-devel BuildRequires: icu4j-eclipse >= 1:4.4.2-2 -BuildRequires: tomcat >= 7.0.21-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: 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 @@ -102,7 +104,9 @@ 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: tomcat >= 7.0.21-2 +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: jetty >= 6.1.24-1 Requires: jsch >= 0.1.41 Requires: lucene >= 2.9.4-5 @@ -154,7 +158,7 @@ Eclipse Plugin Development Environment. This package is required for developing Eclipse plugins. %prep -%setup -q -n eclipse-build-e72072bac3d127680aee62b8b56082400c07ff27 +%setup -q -n eclipse-build-de0fa989dbe8ac96ffa5069829f2088b2714a38c cp %{SOURCE1} . ant applyPatches pushd build/eclipse-3.7.1-src @@ -493,13 +497,8 @@ 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_* @@ -643,11 +642,8 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/dropins/sdk %changelog - -* Wed Nov 09 2011 Roland Grunberg 1:3.7.1-2 -- Upgrade to Tomcat 7 Jasper. -- Include org.eclipse.jdt.core as part of platform to avoid cyclic - dependency between platform and jdt. +* Tue Nov 16 2011 Roland Grunberg 1:3.7.1-2 +- Upload new source fixing RHBZ #753090. * Tue Nov 08 2011 Roland Grunberg 1:3.7.1-1 - Update to 3.7.1. diff --git a/sources b/sources index 4d503f0..c0b2b4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -668fa322faa1940947c4f6ae90a383ad eclipse-build-e72072bac3d127680aee62b8b56082400c07ff27.tar.xz e93946a256ba9bf468fc1588aab60e20 eclipse-3.7.1-src.tar.bz2 +c990324c206624e4398bc115da92b30e eclipse-build-de0fa989dbe8ac96ffa5069829f2088b2714a38c.tar.xz