From bac61fd0e138746214de4243ade99b4d3ff86995 Mon Sep 17 00:00:00 2001 From: Andrew Overholt Date: Mar 07 2006 18:04:46 +0000 Subject: - One more small help fix (include tomcatwrapper.jar o.e.tomcat manifest). --- diff --git a/eclipse-tomcat55.patch b/eclipse-tomcat55.patch index 282b9cb..cdff92a 100644 --- a/eclipse-tomcat55.patch +++ b/eclipse-tomcat55.patch @@ -4,7 +4,7 @@ RCS file: /cvsroot/eclipse/org.eclipse.tomcat/.classpath,v retrieving revision 1.20 diff -u -r1.20 .classpath --- .classpath 21 Apr 2005 23:31:58 -0000 1.20 -+++ .classpath 6 Mar 2006 21:10:23 -0000 ++++ .classpath 7 Mar 2006 17:31:59 -0000 @@ -1,29 +1,36 @@ @@ -70,7 +70,7 @@ RCS file: /cvsroot/eclipse/org.eclipse.tomcat/about.html,v retrieving revision 1.24 diff -u -r1.24 about.html --- about.html 21 Jun 2005 00:52:06 -0000 1.24 -+++ about.html 6 Mar 2006 21:10:23 -0000 ++++ about.html 7 Mar 2006 17:31:59 -0000 @@ -8,7 +8,7 @@

About This Content

@@ -167,15 +167,15 @@ RCS file: /cvsroot/eclipse/org.eclipse.tomcat/META-INF/MANIFEST.MF,v retrieving revision 1.14 diff -u -r1.14 MANIFEST.MF --- META-INF/MANIFEST.MF 19 May 2005 04:05:11 -0000 1.14 -+++ META-INF/MANIFEST.MF 6 Mar 2006 21:10:40 -0000 -@@ -2,30 +2,34 @@ ++++ META-INF/MANIFEST.MF 7 Mar 2006 17:32:16 -0000 +@@ -2,30 +2,35 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true -Bundle-Version: 4.1.30.1 --Bundle-ClassPath: tomcatwrapper.jar, +Bundle-Version: 5.5.15 -+Bundle-ClassPath: catalina-optional.jar, + Bundle-ClassPath: tomcatwrapper.jar, ++ catalina-optional.jar, catalina.jar, - bootstrap.jar, commons-beanutils.jar, @@ -213,7 +213,7 @@ diff -u -r1.14 MANIFEST.MF Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin -@@ -54,8 +58,7 @@ +@@ -54,8 +59,7 @@ mx4j.util;x-internal:=true, org.apache.catalina;x-internal:=true, org.apache.catalina.connector;x-internal:=true, @@ -223,7 +223,7 @@ diff -u -r1.14 MANIFEST.MF org.apache.catalina.realm;x-internal:=true, org.apache.catalina.servlets;x-internal:=true, org.apache.commons.beanutils;x-internal:=true, -@@ -69,7 +72,6 @@ +@@ -69,7 +73,6 @@ org.apache.commons.digester.rss;x-internal:=true, org.apache.commons.digester.xmlrules;x-internal:=true, org.apache.commons.logging;x-internal:=true, @@ -231,7 +231,7 @@ diff -u -r1.14 MANIFEST.MF org.apache.commons.modeler;x-internal:=true, org.apache.commons.modeler.ant;x-internal:=true, org.apache.commons.modeler.mbeans;x-internal:=true, -@@ -79,13 +81,11 @@ +@@ -79,13 +82,11 @@ org.apache.coyote.http11;x-internal:=true, org.apache.coyote.http11.filters;x-internal:=true, org.apache.coyote.memory;x-internal:=true, @@ -246,7 +246,7 @@ diff -u -r1.14 MANIFEST.MF org.apache.jasper.xmlparser;x-internal:=true, org.apache.naming;x-internal:=true, org.apache.naming.factory;x-internal:=true, -@@ -95,12 +95,9 @@ +@@ -95,12 +96,9 @@ org.apache.tomcat.util;x-internal:=true, org.apache.tomcat.util.buf;x-internal:=true, org.apache.tomcat.util.collections;x-internal:=true, @@ -265,7 +265,7 @@ RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/Ec retrieving revision 1.8 diff -u -r1.8 EclipseErrorReportValve.java --- src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 23 May 2005 03:58:04 -0000 1.8 -+++ src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 6 Mar 2006 21:10:40 -0000 ++++ src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 7 Mar 2006 17:32:16 -0000 @@ -69,15 +69,27 @@ package org.eclipse.tomcat.internal; @@ -385,7 +385,7 @@ RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/To retrieving revision 1.43 diff -u -r1.43 TomcatAppServer.java --- src/org/eclipse/tomcat/internal/TomcatAppServer.java 22 Jun 2005 15:29:56 -0000 1.43 -+++ src/org/eclipse/tomcat/internal/TomcatAppServer.java 6 Mar 2006 21:10:40 -0000 ++++ src/org/eclipse/tomcat/internal/TomcatAppServer.java 7 Mar 2006 17:32:17 -0000 @@ -11,27 +11,29 @@ package org.eclipse.tomcat.internal; @@ -953,7 +953,7 @@ RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/To retrieving revision 1.24 diff -u -r1.24 TomcatPlugin.java --- src/org/eclipse/tomcat/internal/TomcatPlugin.java 23 May 2005 03:58:20 -0000 1.24 -+++ src/org/eclipse/tomcat/internal/TomcatPlugin.java 6 Mar 2006 21:10:40 -0000 ++++ src/org/eclipse/tomcat/internal/TomcatPlugin.java 7 Mar 2006 17:32:17 -0000 @@ -24,13 +24,16 @@ public final static String PREF_ACCEPT_COUNT = "acceptCount"; //$NON-NLS-1$ public final static String PREF_MAX_PROCESSORS = "maxProcessors"; //$NON-NLS-1$ diff --git a/eclipse.spec b/eclipse.spec index f0e106e..ab47f72 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -27,7 +27,7 @@ Epoch: 1 Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 1jpp_12fc +Release: 1jpp_13fc License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1305,6 +1305,9 @@ fi %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version} %changelog +* Tue Mar 07 2006 Andrew Overholt 3.1.2-1jpp_13fc +- One more small help fix (include tomcatwrapper.jar o.e.tomcat manifest). + * Fri Mar 03 2006 Andrew Overholt 3.1.2-1jpp_12fc - Only build with a native ecj on x86{,_64}