From 0be4fd55ffb9e88a72c374cd59606ab03c09b380 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Jul 06 2006 12:54:28 +0000 Subject: - Temporarily add webapp patch for ppc64, s390, and s390x. --- diff --git a/eclipse.spec b/eclipse.spec index 8af3b9a..268e2c0 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -109,6 +109,7 @@ Patch29: %{name}-tomcat55-build.patch 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 @@ popd 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 @@ fi %{_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 @@ fi %endif %changelog +* Thu Jul 06 2006 Andrew Overholt 3.2.0-1jpp_1fc +- Temporarily add webapp patch for ppc64, s390, and s390x. + * Wed Jul 05 2006 Andrew Overholt 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.