rpms/tomcat5/devel tomcat5-5.0.30-bz163689.patch, NONE, 1.1 tomcat5.spec, 1.31, 1.32

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	tomcat5.spec 
Added Files:
	tomcat5-5.0.30-bz163689.patch 
Log Message:
Build with ppc64 and s390x's broken struts

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

--- NEW FILE tomcat5-5.0.30-bz163689.patch ---
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-catalina/webapps/admin/build.xml~	2004-11-24 16:55:34.000000000 +0000
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-catalina/webapps/admin/build.xml	2005-07-21 10:16:49.000000000 +0100
@@ -166,9 +166,11 @@
   <!-- ======================== BUILD: Copy JARs ========================== -->
   <target name="copy-struts.jar" if="struts.present">
     <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${struts.jar}"/>
+<!--
     <copy todir="${webapps.build}/${webapp.name}/WEB-INF" file="${struts.lib}/struts-bean.tld"/>
     <copy todir="${webapps.build}/${webapp.name}/WEB-INF" file="${struts.lib}/struts-html.tld"/>
     <copy todir="${webapps.build}/${webapp.name}/WEB-INF" file="${struts.lib}/struts-logic.tld"/>
+-->
   </target>
 
 
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml~	2005-07-21 10:45:22.000000000 +0100
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml	2005-07-21 10:51:34.000000000 +0100
@@ -315,6 +315,7 @@
              addWebXmlMappings="true"
              outputDir="${jsp-examples.base}/WEB-INF/src" />
 
+<!--
     <jasper2 
              package="admin"
              compile="false"
@@ -323,6 +324,7 @@
              webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
              addWebXmlMappings="true"
              outputDir="${admin.base}/WEB-INF/src/admin" />
+-->
 
     <javac destdir="${ROOT.base}/WEB-INF/classes"
            optimize="off"


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- tomcat5.spec	20 Jul 2005 19:17:19 -0000	1.31
+++ tomcat5.spec	21 Jul 2005 10:17:21 -0000	1.32
@@ -2,7 +2,7 @@
 %define full_name	jakarta-%{name}
 %define version		5.0.30
 %define majversion	5.0
-%define release		7jpp_0fc
+%define release		8jpp_1fc
 %define section		free
 
 %define summary		Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
@@ -55,6 +55,7 @@
 Patch9:			%{name}-%{version}-catalina.sh.patch
 Patch10:		%{name}-%{version}-precompile.patch
 Patch11:		%{name}-%{version}-no-daemon.patch
+Patch12:		%{name}-%{version}-bz163689.patch
 BuildRoot:		%{_tmppath}/%{name}-root-%{version}
 
 Requires:		jpackage-utils >= 0:1.6.0
@@ -222,6 +223,9 @@
 %patch9 -p1
 %patch10 -p2 -b .orig
 %patch11 -p2 -b .orig
+%ifarch ppc64 s390x
+%patch12 -p2 -b .orig
+%endif
 
 %build
 
@@ -824,6 +828,12 @@
 %{serverdir}/webapps/*
 
 %changelog
+* Thu Jul 21 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-8jpp_1fc
+- Build on ia64, ppc64, s390 and s390x.
+
+* Thu Jul 21 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-8jpp
+- Correct ownership of admin webapps directory.
+
 * Wed Jul 20 2005 Gary Benson <gbenson at redhat.com>
 - Remove jarfiles from the tarball.
 - Switch to aot-compile-rpm.