rpms/eclipse/devel eclipse.spec,1.479,1.480

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17512

Modified Files:
	eclipse.spec 
Log Message:
* Wed Sep 05 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-15
- Update tomcat5, commons-el, and commons-logging to required releases
  with proper OSGi manifests.


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- eclipse.spec	4 Sep 2007 21:14:28 -0000	1.479
+++ eclipse.spec	5 Sep 2007 20:28:17 -0000	1.480
@@ -23,7 +23,7 @@
 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: 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: 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 @@
 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 @@
 %endif
 
 %changelog
+* Wed Sep 05 2007 Andrew Overholt <overholt at redhat.com> 3.3.0-15
+- Update tomcat5, commons-el, and commons-logging to required releases
+  with proper OSGi manifests.
+
 * Mon Sep 04 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-14
 - Add Fedora Eclipse product plugin.
 - Add Requires: eclipse-rpm-editor to platform subpackage.