rpms/eclipse/devel eclipse-webapp-tomcat55-newarches.patch, NONE, 1.1 eclipse.spec, 1.292, 1.293

[fedora-cvs-commits at redhat.com]

Author: overholt

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20151

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-webapp-tomcat55-newarches.patch 
Log Message:
* Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
- Temporarily add webapp patch for ppc64, s390, and s390x.


eclipse-webapp-tomcat55-newarches.patch:
 build.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-webapp-tomcat55-newarches.patch ---
--- build.xml.orig	2006-07-06 08:52:15.000000000 -0400
+++ build.xml	2006-07-06 08:52:37.000000000 -0400
@@ -170,6 +170,7 @@
 		<!-- generate java code from JSPs -->
 		<path id="jasper.classpath" > 
 			<pathelement location="../org.apache.ant/lib/ant.jar"/>
+			<pathelement location="../org.apache.ant/lib/ant-launcher.jar"/>
 			<pathelement location="../org.apache.ant/lib/optional.jar"/>
 			<pathelement location="../org.eclipse.tomcat/jasper-compiler.jar" />
 			<pathelement location="../org.eclipse.tomcat/jasper-runtime.jar" />
@@ -181,10 +182,9 @@
 		<java
 			classname="org.apache.jasper.JspC"
 			fork="true"
-			failonerror="false"
+			failonerror="true"
 			classpathref="jasper.classpath"
 			output="${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}">
-			<arg value="-v3" />
 			<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
 			<arg value="-die" />
 			<arg value="-p" /><arg value="org.eclipse.help.internal.webapp.jsp"/>


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -r1.292 -r1.293
--- eclipse.spec	6 Jul 2006 02:25:27 -0000	1.292
+++ eclipse.spec	6 Jul 2006 12:54:28 -0000	1.293
@@ -109,6 +109,7 @@
 Patch30: 	%{name}-tomcat55-build.2.patch
 Patch50:        %{name}-tomcat55-build.3.patch
 Patch31: 	%{name}-webapp-tomcat55.patch
+Patch56: 	%{name}-webapp-tomcat55-newarches.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707 
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178726
 Patch33:        %{name}-compare-create-api.patch
@@ -407,6 +408,11 @@
 pushd plugins/org.eclipse.help.webapp
 %patch31 -p0
 popd
+# FIXME:  this is just until tomcat is built on these arches
+%else
+pushd plugins/org.eclipse.help.webapp
+%patch56 -p0
+popd
 %endif
 pushd plugins/org.eclipse.compare
 #%patch33 -p0
@@ -1608,7 +1614,7 @@
 %{_libdir}/gcj/%{name}/servlets-invoker.jar*
 %{_libdir}/gcj/%{name}/servlets-manager.jar*
 %{_libdir}/gcj/%{name}/tomcat-coyote.jar*
-%{_libdir}/gcj/%{name}/tomcat-http.jar*
+%{_libdir}/gcj/%{name}/tomcat-http11.jar*
 %{_libdir}/gcj/%{name}/tomcat-util.jar*
 %endif
 %endif
@@ -1625,6 +1631,9 @@
 %endif
 
 %changelog
+* Thu Jul 06 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
+- Temporarily add webapp patch for ppc64, s390, and s390x.
+
 * Wed Jul 05 2006 Andrew Overholt <overholt at redhat.com> 3.2.0-1jpp_1fc
 - Don't require tomcat on ppc64, s390, or s390x until we've got it there.
 - org.eclipse.tomcat -> org.eclipse.tomcat/lib.