- Update to tomcat 5.5.20.

This commit is contained in:
Ben Konrath 2007-03-15 15:46:11 +00:00
parent 30792b577b
commit 32b1de4498
2 changed files with 372 additions and 1105 deletions

File diff suppressed because it is too large Load Diff

View File

@ -19,7 +19,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
Release: 3%{?dist}
Release: 4%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@ -143,9 +143,9 @@ BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax
BuildRequires: jsch >= 0:0.1.28-1jpp
BuildRequires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
BuildRequires: mx4j >= 2.1
BuildRequires: tomcat5 >= 5.5.17
BuildRequires: tomcat5-jasper >= 5.5.17
BuildRequires: tomcat5-servlet-2.4-api >= 5.5.17
BuildRequires: tomcat5 = 5.5.20
BuildRequires: tomcat5-jasper = 5.5.20
BuildRequires: tomcat5-servlet-2.4-api = 5.5.20
BuildRequires: lucene
BuildRequires: lucene-devel
BuildRequires: regexp
@ -241,9 +241,9 @@ Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-r
Requires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch
Requires: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-el jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-logging jakarta-commons-modeler jakarta-commons-pool
Requires: mx4j >= 2.1
Requires: tomcat5 >= 5.5.17
Requires: tomcat5-jasper >= 5.5.17
Requires: tomcat5-servlet-2.4-api >= 5.5.17
Requires: tomcat5 = 5.5.20
Requires: tomcat5-jasper = 5.5.20
Requires: tomcat5-servlet-2.4-api = 5.5.20
Requires: lucene, lucene-devel
Requires: regexp
@ -390,9 +390,10 @@ pushd plugins/org.eclipse.tomcat
%patch6 -p0
%patch7 -p0
popd
sed --in-place "s/4.1.130/5.5.17/g" \
sed --in-place "s/4.1.130/5.5.20/g" \
features/org.eclipse.platform/build.xml \
plugins/org.eclipse.tomcat/build.xml \
plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF \
assemble.*.xml
pushd plugins/org.eclipse.help.webapp
%patch8 -p0
@ -1739,6 +1740,9 @@ fi
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
* Thu Mar 15 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-4
- Update to tomcat 5.5.20.
* Fri Mar 02 2007 Ben Konrath <bkonrath@redhat.com> 3.2.2-3
- Uncomment 'this.generatePackagesStructure = true;' in ecj-gcj patch.