rpms/tomcat5/devel tomcat5-5.0.30-bz163249.patch, NONE, 1.1 tomcat5.spec, 1.41, 1.42

[fedora-cvs-commits at redhat.com]

Author: gbenson

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

Modified Files:
	tomcat5.spec 
Added Files:
	tomcat5-5.0.30-bz163249.patch 
Log Message:
Disable webapps build on ia64 (#163249)

tomcat5-5.0.30-bz163249.patch:
 build.xml |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE tomcat5-5.0.30-bz163249.patch ---
--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml~	2005-08-04 14:51:54.000000000 +0100
+++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml	2005-08-25 10:52:58.000000000 +0100
@@ -295,6 +295,7 @@
       </fileset>
     </path>
 
+<!--
     <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
       <classpath refid="jspc.classpath"/>
     </taskdef>
@@ -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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- tomcat5.spec	25 Aug 2005 09:17:03 -0000	1.41
+++ tomcat5.spec	25 Aug 2005 11:20:00 -0000	1.42
@@ -56,6 +56,7 @@
 Patch9:			%{name}-%{version}-catalina.sh.patch
 Patch10:		%{name}-%{version}-precompile.patch
 Patch11:		%{name}-%{version}-no-daemon.patch
+Patch12:		%{name}-%{version}-bz163249.patch
 BuildRoot:		%{_tmppath}/%{name}-root-%{version}
 
 Requires:		jpackage-utils >= 0:1.6.0
@@ -223,6 +224,9 @@
 %patch9 -p1
 %patch10 -p2 -b .orig
 %patch11 -p2 -b .orig
+%ifarch ia64
+%patch12 -p2 -b .orig
+%endif
 
 %build
 
@@ -827,6 +831,7 @@
 %changelog
 * Thu Aug 25 2005 Gary Benson <gbenson at redhat.com> 0:5.0.30-8jpp_2fc
 - Disable build on ppc64 (#166657).
+- Disable webapps build on ia64 (#163249).
 
 * Wed Aug 24 2005 Gary Benson <gbenson at redhat.com>
 - Add a status command to the init script (from Jesus Rodriguez).