- drop obsolete files

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index 89549de21e4b9e3771b9c91954abba225d7cc80c..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.
@@ -30,6 +31,13 @@ Patch5:              apache-%{name}-dbcp.patch
 Patch6:                apache-%{name}-struts.patch
 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
@@ -41,7 +49,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
@@ -118,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.
@@ -151,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.
@@ -190,6 +197,12 @@ servletów Apache Tomcat.
 %patch7 -p1
 %patch8 -p1
 
+%patch100 -p0
+%patch101 -p0
+%patch102 -p0
+%patch103 -p0
+%patch104 -p0
+
 # we don't need those scripts
 rm -f container/catalina/src/bin/*.bat
 rm -f container/catalina/src/bin/{startup,shutdown}.sh
@@ -408,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