- (Re-apply) Upgrade to Tomcat 7 Jasper.
- Include org.eclipse.jdt.core as part of platform to avoid cyclic dependency between platform and jdt.
This commit is contained in:
parent
9a7ed278ab
commit
aa33d076d8
24
eclipse.spec
24
eclipse.spec
@ -16,11 +16,11 @@ Epoch: 1
|
||||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?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
|
||||
Source2: eclipse-reconciler.sh
|
||||
Source3: %{name}-tmpfiles.conf
|
||||
@ -47,9 +47,7 @@ BuildRequires: libXt-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
|
||||
@ -104,9 +102,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
|
||||
@ -158,7 +154,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 applyPatches
|
||||
pushd build/eclipse-3.7.1-src
|
||||
@ -497,8 +493,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_*
|
||||
@ -642,6 +643,11 @@ rm -rf %{_bindir}/efj/
|
||||
%{_libdir}/%{name}/dropins/sdk
|
||||
|
||||
%changelog
|
||||
* Fri Nov 25 2011 Roland Grunberg <rgrunber@redhat.com> 1:3.7.1-5
|
||||
- (Re-apply) Upgrade to Tomcat 7 Jasper.
|
||||
- Include org.eclipse.jdt.core as part of platform to avoid cyclic
|
||||
dependency between platform and jdt.
|
||||
|
||||
* Mon Nov 21 2011 Roland Grunberg <rgrunber@redhat.com> 1:3.7.1-4
|
||||
- Bump release to match f16 branch.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user