- backported from svn trunk.

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index 211ba7dc99bdabe76f078471906b79e2d5c02bba..6c447071c311f40f355c7dd24e0d207a376af36e 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,5 +1,4 @@
-# TODO
-# - packages for *.renametojar files (-cgi and -ssi in server/lib)
+#
 # Conditional build:
 %bcond_without javadoc         # skip building javadocs
 %bcond_with    jta             # put jta jar into tomcat lib dir.
@@ -9,7 +8,7 @@ Summary:        Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Summary(pl.UTF-8):     Silnik Servlet/JSP Apache będący wzorcową implementacją API Servlet 2.4/JSP 2.0
 Name:          tomcat
 Version:       5.5.27
-Release:       0.9
+Release:       1
 License:       Apache v2.0
 Group:         Networking/Daemons/Java
 Source0:       http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
@@ -31,6 +30,23 @@ Patch6:              apache-%{name}-struts.patch
 Patch7:                apache-%{name}-admin-struts.patch
 Patch8:                apache-%{name}-no_links_to_examples.patch
 URL:           http://tomcat.apache.org/
+# http://tomcat.apache.org/security-5.html
+# Requires upgrade to 6.0.20 or (in future) 5.5.28. Or patch:
+# http://svn.apache.org/viewvc?rev=781362&view=rev
+BuildRequires: security(CVE-2009-0033)
+# http://tomcat.apache.org/security-5.html
+# Requires upgrade to 6.0.20 or (in future) 5.5.28. Or patch:
+# http://svn.apache.org/viewvc?rev=781379&view=rev
+BuildRequires: security(CVE-2009-0580)
+# http://tomcat.apache.org/security-5.html
+# Requires upgrade to 6.0.20 or (in future) 5.5.28. Or patches:
+# http://svn.apache.org/viewvc?rev=781542&view=rev
+# http://svn.apache.org/viewvc?rev=681156&view=rev
+BuildRequires: security(CVE-2009-0783)
+# http://tomcat.apache.org/security-5.html
+# Requires upgrade to 6.0.20 or (in future) 5.5.28. Or patch:
+# http://svn.apache.org/viewvc?rev=750928&view=rev
+BuildRequires: security(CVE-2009-0781)
 %if %{with java_sun}
 BuildRequires: java-sun >= 1.5
 BuildRequires: java-sun-jre >= 1.5
@@ -41,7 +57,7 @@ BuildRequires:        ant >= 1.5.3
 BuildRequires: ant-trax
 BuildRequires: eclipse-jdt
 BuildRequires: jaas
-BuildRequires: jakarta-regexp >= 0:1.3
+BuildRequires: java-regexp >= 0:1.3
 BuildRequires: java-commons-beanutils >= 1.7
 BuildRequires: java-commons-chain
 BuildRequires: java-commons-collections >= 0:3.1
@@ -156,6 +172,7 @@ Summary(pl.UTF-8):  Panel Administracyjny dla Apache Tomcat
 Group:         Networking/Daemons/Java/Servlets
 Requires:      %{name} = %{version}-%{release}
 Requires:      java-commons-chain
+Obsoletes:     apache-tomcat-admin
 
 %description admin
 Administration Web Application for Apache Tomcat.