diff --git a/.gitignore b/.gitignore index 5b09357..4366514 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ eclipse-build-0106a4c5904078e2e03d047210222a677337a1f1.tar.xz /eclipse-3.7.0-I20110512-2000-src.tar.bz2 /eclipse-build-e9abe2e00591bb6a56a4c136fa2efd86e451d59c.tar.xz /eclipse-build-04609626a590e823870c883cc5314cde7ef63504.tar.xz +/eclipse-build-a749348ab5d50d7e4e6db349ec468b9621e96d61.tar.xz diff --git a/eclipse.spec b/eclipse.spec index 939d267..c35ed3d 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: 0.1.RC1%{?dist} +Release: 0.2.RC1%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ -Source0: %{download_url}eclipse-build-04609626a590e823870c883cc5314cde7ef63504.tar.xz +Source0: %{download_url}eclipse-build-a749348ab5d50d7e4e6db349ec468b9621e96d61.tar.xz Source1: %{download_url}eclipse-3.7.0-I20110512-2000-src.tar.bz2 Source17: efj.sh.in # Patch to allow xpcom.cpp to build under latest xulrunner which has removed @@ -56,8 +56,8 @@ BuildRequires: xulrunner-devel BuildRequires: webkitgtk-devel BuildRequires: icu4j-eclipse >= 1:4.4.2-2 -BuildRequires: tomcat5-jasper-eclipse >= 5.5.27-6.3 -BuildRequires: tomcat6-servlet-2.5-api >= 6.0.18-9.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 @@ -116,8 +116,8 @@ 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.27-6.3 -Requires: tomcat6-servlet-2.5-api >= 6.0.18-9.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 @@ -166,7 +166,7 @@ Eclipse Plugin Development Environment. This package is required for developing Eclipse plugins. %prep -%setup -q -n eclipse-build-04609626a590e823870c883cc5314cde7ef63504 +%setup -q -n eclipse-build-a749348ab5d50d7e4e6db349ec468b9621e96d61 cp %{SOURCE1} . ant -DbuildArch=%{eclipse_arch} applyPatches pushd build/eclipse-3.7.0-I20110512-2000-src @@ -560,6 +560,10 @@ fi %{_libdir}/%{name}/dropins/sdk %changelog +* Tue May 17 2011 Chris Aniszczyk 1:3.7.0-0.2.RC1 +- New e-b snapshot, fixes org.eclipse.equinox.util issue +- updated servlet and jsp related dependencies + * Tue May 17 2011 Chris Aniszczyk 1:3.7.0-0.1.RC1 - New e-b snapshot - first eclipse 3.7 build based on 3.7 RC1. diff --git a/sources b/sources index 3f326b1..626dd41 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 734e567150b66bd8c4da083e2afa19ec eclipse-3.7.0-I20110512-2000-src.tar.bz2 -cdc6de7eb2658abe11c0dc0814d4bb1d eclipse-build-04609626a590e823870c883cc5314cde7ef63504.tar.xz +fefae8aa961b46f518e0d2f8c316d1af eclipse-build-a749348ab5d50d7e4e6db349ec468b9621e96d61.tar.xz