- backported from svn trunk.

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index 321380afbebf9ba0091abbdbc2f6eb40384c050f..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.8
+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
@@ -27,23 +26,38 @@ Patch2:             apache-%{name}-native.patch
 Patch3:                apache-%{name}-skip-jdt.patch
 Patch4:                apache-%{name}-no-connectors.patch
 Patch5:                apache-%{name}-dbcp.patch
-# this patch is needed for struts >= 1.3
 Patch6:                apache-%{name}-struts.patch
-# WTF? Why is it needed? Is it related to struts version?
 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
 %else
-# BuildRequires:       jsse >= 0:1.0.3
 BuildRequires: java-gcj-compat-devel
 %endif
 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
@@ -67,11 +81,9 @@ BuildRequires:       java-log4j
 BuildRequires: java-mail >= 0:1.3.1
 BuildRequires: java-puretls
 BuildRequires: java-servletapi5 = %{version}
-#BuildRequires:        java-struts >= 0:1.2.7
 BuildRequires: java-struts >= 1.0.2
 BuildRequires: java-xerces >= 0:2.7.1
 BuildRequires: java-xml-commons
-#BuildRequires:        java-xml-commons >= 1.3
 BuildRequires: jaxp_parser_impl >= 0:2.7.1
 BuildRequires: jdbc-stdext >= 0:2.0
 BuildRequires: jmx
@@ -89,13 +101,10 @@ Requires(pre):     /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires:      %{name}-jasper = %{version}-%{release}
 Requires:      jaas
-#Requires:     jaf >= 1.0.1
 Requires:      java-commons-beanutils
 Requires:      java-commons-collections
-#Requires:     java-commons-dbcp-tomcat5
 Requires:      java-commons-digester
 Requires:      java-commons-el
-#Requires:     java-commons-fileupload
 Requires:      java-commons-logging
 Requires:      java-commons-modeler
 Requires:      java-commons-pool-tomcat5
@@ -163,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.
@@ -195,18 +205,18 @@ servletów Apache Tomcat.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
-# we don't need dos scripts
+# we don't need those scripts
 rm -f container/catalina/src/bin/*.bat
-# or those
 rm -f container/catalina/src/bin/{startup,shutdown}.sh
 
 # causes file(1) rpm to abort, and not really neccessary file
-rm container/webapps/admin/images/Thumbs.db
 # file: Thumbs.db: ERROR: Cannot read short stream (Invalid argument)
 # rpm: error: magic_file(ms, "Thumbs.db") failed: mode 37777700644 Cannot read short stream (Invalid argument)
+rm container/webapps/admin/images/Thumbs.db
 
-# servletapi built from jakarta-servletapi5.spec
+# servletapi built from java-servletapi5.spec
 rm -rf servletapi
 
 # Remove pre-built jars