rpms/tomcat5/devel tomcat5-5.0.30-bz163689.patch, 1.3, 1.4 tomcat5.spec, 1.34, 1.35 tomcat5-5.0.30-ppc64.patch, 1.1, NONE

[fedora-cvs-commits redhat com]

Author: gbenson

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31122

Modified Files:
	tomcat5-5.0.30-bz163689.patch tomcat5.spec 
Removed Files:
	tomcat5-5.0.30-ppc64.patch 
Log Message:
Looks like it...

tomcat5-5.0.30-bz163689.patch:
 jakarta-tomcat-5/build.xml                        |    6 ++++++
 jakarta-tomcat-catalina/webapps/admin/build.xml   |    2 ++
 jakarta-tomcat-catalina/webapps/docs/build.xml    |   20 ++++++++++++++++++++
 jakarta-tomcat-catalina/webapps/manager/build.xml |    2 ++
 4 files changed, 30 insertions(+)

Index: tomcat5-5.0.30-bz163689.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.0.30-bz163689.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat5-5.0.30-bz163689.patch	21 Jul 2005 11:37:45 -0000	1.3
+++ tomcat5-5.0.30-bz163689.patch	21 Jul 2005 13:22:17 -0000	1.4
@@ -185,3 +185,21 @@
  
      <!-- Images Subdirectory -->
      <copy todir="${webapps.build}/${webapp.name}/images">
+--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml~	2005-07-21 12:23:40.000000000 +0100
++++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml	2005-07-21 13:38:20.000000000 +0100
+@@ -307,6 +307,7 @@
+              addWebXmlMappings="true"
+              outputDir="${ROOT.base}/WEB-INF/src" />
+ 
++<!--
+     <jasper2 
+              compile="false"
+              validateXml="false"
+@@ -314,6 +315,7 @@
+ 	     webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
+              addWebXmlMappings="true"
+              outputDir="${jsp-examples.base}/WEB-INF/src" />
++-->
+ 
+ <!--
+     <jasper2 


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- tomcat5.spec	21 Jul 2005 13:06:22 -0000	1.34
+++ tomcat5.spec	21 Jul 2005 13:22:17 -0000	1.35
@@ -56,7 +56,6 @@
 Patch10:		%{name}-%{version}-precompile.patch
 Patch11:		%{name}-%{version}-no-daemon.patch
 Patch12:		%{name}-%{version}-bz163689.patch
-Patch13:		%{name}-%{version}-ppc64.patch
 BuildRoot:		%{_tmppath}/%{name}-root-%{version}
 
 Requires:		jpackage-utils >= 0:1.6.0
@@ -227,9 +226,6 @@
 %ifarch ppc64 s390x
 %patch12 -p2 -b .orig
 %endif
-%ifarch ppc64
-%patch13 -p2 -b .orig
-%endif
 
 %build
 


--- tomcat5-5.0.30-ppc64.patch DELETED ---