SPECS: apache-tomcat.spec - sed script converted to patch

pawelz pawelz at pld-linux.org
Thu Jan 22 13:10:50 CET 2009


Author: pawelz                       Date: Thu Jan 22 12:10:50 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sed script converted to patch

---- Files affected:
SPECS:
   apache-tomcat.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/apache-tomcat.spec
diff -u SPECS/apache-tomcat.spec:1.60 SPECS/apache-tomcat.spec:1.61
--- SPECS/apache-tomcat.spec:1.60	Thu Jan 22 12:27:28 2009
+++ SPECS/apache-tomcat.spec	Thu Jan 22 13:10:44 2009
@@ -21,6 +21,8 @@
 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
@@ -138,6 +140,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # servletapi built from jakarta-servletapi5.spec
 rm -rf servletapi
@@ -145,9 +148,6 @@
 # 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)
 
@@ -375,6 +375,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2009/01/22 12:10:44  pawelz
+- sed script converted to patch
+
 Revision 1.60  2009/01/22 11:27:28  pawelz
 - updated depndencies
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-tomcat.spec?r1=1.60&r2=1.61&f=u



More information about the pld-cvs-commit mailing list