- sed script converted to patch

Changed files:
    apache-tomcat.spec -> 1.61

diff --git a/apache-tomcat.spec b/apache-tomcat.spec
index 1ef663b6d72e4db7a09e3346d1410e99728ce268..39e0306a2f5a79f77769427fa94d9662c3dae0d1 100644 (file)
--- a/apache-tomcat.spec
+++ b/apache-tomcat.spec
@@ -20,6 +20,8 @@ Patch2:               %{name}-native.patch
 Patch3:                %{name}-skip-jdt.patch
 Patch4:                %{name}-no-connectors.patch
 Patch5:                %{name}-dbcp.patch
+# this patch is needed for struts >= 1.3
+Patch6:                %{name}-struts.patch
 URL:           http://tomcat.apache.org/
 BuildRequires: ant >= 1.5.3
 BuildRequires: ant-trax
@@ -137,6 +139,7 @@ Dokumentacja do Tomcata - kontekera Servlet/JSP.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # servletapi built from jakarta-servletapi5.spec
 rm -rf servletapi
@@ -144,9 +147,6 @@ rm -rf servletapi
 # Remove pre-built jars
 find -name '*.jar' | xargs rm -fv
 
-# for jakarta-struts >= 1.3.10
-find -name '*.jsp' | xargs sed -i 's/<html:html locale="true">/<html:html>/'
-
 %build
 TOPDIR=$(pwd)