diff --git a/eclipse.spec b/eclipse.spec index 27d620d..2a1a363 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -23,7 +23,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 14%{?dist} +Release: 15%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -107,11 +107,13 @@ BuildRequires: libXt-devel BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging BuildRequires: ant-javamail ant-jdepend ant-junit ant-nodeps ant-swing ant-trax ant-jsch BuildRequires: jsch >= 0:0.1.31 -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: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool +BuildRequires: jakarta-commons-el >= 1.0-8jpp +BuildRequires: jakarta-commons-logging >= 1.0.4-6jpp.3 BuildRequires: mx4j >= 2.1 -BuildRequires: tomcat5 >= 5.5.23 -BuildRequires: tomcat5-jasper >= 5.5.23 -BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23 +BuildRequires: tomcat5 >= 5.5.23-9jpp.4 +BuildRequires: tomcat5-jasper >= 5.5.23-9jpp.4 +BuildRequires: tomcat5-servlet-2.4-api >= 5.5.23-9jpp.4 BuildRequires: jetty BuildRequires: lucene >= 1.9.1 BuildRequires: lucene-contrib >= 1.9.1 @@ -208,12 +210,14 @@ Requires(postun): %{name}-rcp = %{epoch}:%{version}-%{release} #Requires: ant-apache-bsf ant-commons-net Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging 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: jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-digester jakarta-commons-dbcp jakarta-commons-fileupload jakarta-commons-launcher jakarta-commons-modeler jakarta-commons-pool +Requires: jakarta-commons-el >= 1.0-8jpp +Requires: jakarta-commons-logging >= 1.0.4-6jpp.3 Requires: mx4j >= 2.1 -Requires: tomcat5 >= 5.5.23 -Requires: tomcat5-jasper-eclipse >= 5.5.23 -Requires: tomcat5-servlet-2.4-api >= 5.5.23 -Requires: tomcat5-jsp-2.0-api >= 5.5.23 +Requires: tomcat5 >= 5.5.23-9jpp.4 +Requires: tomcat5-jasper-eclipse >= 5.5.23-9jpp.4 +Requires: tomcat5-servlet-2.4-api >= 5.5.23-9jpp.4 +Requires: tomcat5-jsp-2.0-api >= 5.5.23-9jpp.4 Requires: jetty Requires: jsch >= 0.1.31 Requires: lucene >= 1.9.1 @@ -595,7 +599,7 @@ rm plugins/org.apache.jasper_5.5.17.v200706111724.jar ln -s %{_datadir}/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar \ plugins/org.apache.jasper_5.5.17.v200706111724.jar -# link to serlet-api +# link to servlet-api rm plugins/javax.servlet_2.4.0.v200706111738.jar ln -s %{_javadir}/tomcat5-servlet-2.4-api.jar plugins/javax.servlet_2.4.0.v200706111738.jar @@ -1569,6 +1573,10 @@ fi %endif %changelog +* Wed Sep 05 2007 Andrew Overholt 3.3.0-15 +- Update tomcat5, commons-el, and commons-logging to required releases + with proper OSGi manifests. + * Mon Sep 04 2007 Ben Konrath 3.3.0-14 - Add Fedora Eclipse product plugin. - Add Requires: eclipse-rpm-editor to platform subpackage.