- drop obsolete files

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index c0c58ba2986849b129a319883b2ee44da1268326..586bb86ed0cc5bb4cff78c5d71f39a4fe8d459db 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,5 +1,6 @@
 # TODO
-# - packages for *.renametojar files (-cgi and -ssi in server/lib)
+# - rename %{name}-jasper -> java-jasper?
+#
 # Conditional build:
 %bcond_without javadoc         # skip building javadocs
 %bcond_with    jta             # put jta jar into tomcat lib dir.
@@ -9,7 +10,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
@@ -27,24 +28,28 @@ 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
+# Following patches are applied in tomcat svn. Remove them while updating to 5.5.28
+# See: http://tomcat.apache.org/security-5.html
+Patch100:      tomcat-CVE-2008-5515.patch
+Patch101:      tomcat-CVE-2009-0033.patch
+Patch102:      tomcat-CVE-2009-0580.patch
+Patch103:      tomcat-CVE-2009-0781.patch
+Patch104:      tomcat-CVE-2009-0783.patch
 URL:           http://tomcat.apache.org/
 %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
@@ -68,11 +73,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
@@ -90,13 +93,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
@@ -126,8 +126,6 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _vardir         %{_var}/lib/tomcat
 %define                _sysconfdir     /etc/tomcat
 
-%define find_jar() %{expand:%%define jarfile {%(jar=$(find-jar %1); echo ${jar:-%%nil})}}%{?jarfile}%{!?jarfile:%{error:find-jar %1 failed}}%{nil}
-
 %description
 Tomcat is the servlet container that is used in the official Reference
 Implementation for the Java Servlet and JavaServer Pages technologies.
@@ -159,11 +157,12 @@ The Tomcat Servlet/JSP Container documentation.
 Dokumentacja do Tomcata - kontenera Servlet/JSP.
 
 %package admin
-Summary:       Apache Tomcat`s Administration Web Application
+Summary:       Apache Tomcat's Administration Web Application
 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.
@@ -198,17 +197,22 @@ servletów Apache Tomcat.
 %patch7 -p1
 %patch8 -p1
 
-# we don't need dos scripts
+%patch100 -p0
+%patch101 -p0
+%patch102 -p0
+%patch103 -p0
+%patch104 -p0
+
+# 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
@@ -417,8 +421,7 @@ fi
 %{_tomcatdir}/work
 %{_tomcatdir}/shared
 %dir %{_vardir}
-# these directory has to be writeable because /admin need to modify config
-# files and create temporary files
+# these directories have to be writeable because /admin needs to modify config files and create temporary files
 %dir %attr(775,root,tomcat) %{_vardir}/conf
 %dir %attr(775,root,tomcat) %{_vardir}/conf/Catalina
 %dir %{_vardir}/conf/Catalina/localhost