diff --git a/eclipse-help-toolbar.patch b/eclipse-help-toolbar.patch new file mode 100644 index 0000000..9cd3604 --- /dev/null +++ b/eclipse-help-toolbar.patch @@ -0,0 +1,71 @@ +### Eclipse Workspace Patch 1.0 +#P org.eclipse.help.webapp +Index: advanced/tocToolbar.jsp +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/tocToolbar.jsp,v +retrieving revision 1.14 +diff -u -r1.14 tocToolbar.jsp +--- plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp 22 Jan 2009 22:19:55 -0000 1.14 ++++ plugins/org.eclipse.help.webapp/advanced/tocToolbar.jsp 21 Sep 2009 20:55:27 -0000 +@@ -16,6 +16,9 @@ + String printError = UrlUtil.JavaScriptEncode(ServletResources.getString("PrintError", request)); + String menuData = printTopicLabel + "=printTopic(\\'" + printError + "\\')," + printTocLabel + "=printToc(\\'" + printError + "\\')"; + String quickSearchError = UrlUtil.JavaScriptEncode(ServletResources.getString("QuickSearchError", request)); ++ // See Bug 290064 for an explanation of why these constants are used ++ final String ON = "on"; ++ final String OFF = "off"; + %> + + +@@ -62,6 +65,6 @@ + + + +- "/> ++ + + +\ No newline at end of file +Index: advanced/searchToolbar.jsp +=================================================================== +RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/advanced/searchToolbar.jsp,v +retrieving revision 1.12 +diff -u -r1.12 searchToolbar.jsp +--- plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp 29 Aug 2007 22:45:40 -0000 1.12 ++++ plugins/org.eclipse.help.webapp/advanced/searchToolbar.jsp 21 Sep 2009 20:55:27 -0000 +@@ -1,5 +1,5 @@ + <%-- +- Copyright (c) 2000, 2007 IBM Corporation and others. ++ Copyright (c) 2000, 2009 IBM Corporation and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Public License v1.0 + which accompanies this distribution, and is available at +@@ -9,6 +9,11 @@ + IBM Corporation - initial API and implementation + --%> + <%@ include file="header.jsp"%> ++<% ++ // See Bug 290064 for an explanation of why these constants are used ++ final String ON = "on"; ++ final String OFF = "off"; ++%> + + + +@@ -27,13 +32,13 @@ + + + +- "/> ++ + + + + + + +- "/> ++ + + +\ No newline at end of file diff --git a/eclipse.spec b/eclipse.spec index 59aa9b0..e27d54d 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -30,7 +30,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 0.13%{?dist} +Release: 1%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -136,6 +136,11 @@ Patch50: %{name}-target-platform-template.patch # Already applied in eclipse-build upstream rev. #23023 Patch51: %{name}-addusrsharedropins.patch +#Fix for help toolbar jsp compile error. +#See https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064 +#Already added to eclipse-build. +Patch52: %{name}-help-toolbar.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant BuildRequires: jpackage-utils >= 0:1.5, make, gcc @@ -652,6 +657,7 @@ popd # target platform template patch %patch50 -p0 +%patch52 -p0 popd @@ -1423,6 +1429,9 @@ fi #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source %changelog +* Tue Sep 22 2009 Alexander Kurtakov 1:3.5.0-1 +- Fix help toolbar jsp problem. + * Fri Sep 18 2009 Alexander Kurtakov 1:3.5.0-0.13 - Update ecf-filetransfer and build it.