diff --git a/eclipse-ecj-square-bracket-classpath.patch b/eclipse-ecj-square-bracket-classpath.patch index bba56e5..97a2cf3 100644 --- a/eclipse-ecj-square-bracket-classpath.patch +++ b/eclipse-ecj-square-bracket-classpath.patch @@ -1,12 +1,10 @@ -### Eclipse Workspace Patch 1.0 -#P org.eclipse.jdt.core Index: batch/org/eclipse/jdt/internal/compiler/batch/Main.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java,v retrieving revision 1.254.4.1 diff -u -r1.254.4.1 Main.java --- batch/org/eclipse/jdt/internal/compiler/batch/Main.java 2 Jul 2006 10:11:58 -0000 1.254.4.1 -+++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 20 Oct 2006 21:45:05 -0000 ++++ batch/org/eclipse/jdt/internal/compiler/batch/Main.java 19 Jan 2007 19:22:57 -0000 @@ -28,9 +28,11 @@ import java.text.MessageFormat; import java.util.ArrayList; @@ -40,7 +38,7 @@ diff -u -r1.254.4.1 Main.java import org.eclipse.jdt.internal.compiler.util.Util; public class Main implements ProblemSeverities, SuffixConstants { -@@ -2989,56 +2991,73 @@ +@@ -2989,56 +2991,74 @@ ArrayList currentRuleSpecs = new ArrayList(defaultSize); StringTokenizer tokenizer = new StringTokenizer(currentPath, File.pathSeparator + "[]", true); //$NON-NLS-1$ @@ -90,6 +88,7 @@ diff -u -r1.254.4.1 Main.java - case readyToCloseEndingWithRules: case readyToCloseOrOtherEntry: - state = readyToCloseOrOtherEntry; ++ Collections.reverse(currentRuleSpecs); addNewEntry(paths, currentClasspathName, currentRuleSpecs, customEncoding, isSourceOnly); currentRuleSpecs.clear(); + state = readyForPathOrRules; @@ -139,7 +138,7 @@ diff -u -r1.254.4.1 Main.java state = error; } -@@ -3046,24 +3065,25 @@ +@@ -3046,24 +3066,26 @@ // regular word switch (state) { case start: @@ -170,10 +169,11 @@ diff -u -r1.254.4.1 Main.java - case readyToCloseOrOtherEntry : + case readyForPathOrRules: + case readyToCloseOrOtherEntry: ++ Collections.reverse(currentRuleSpecs); addNewEntry(paths, currentClasspathName, currentRuleSpecs, customEncoding, isSourceOnly); break; default : -@@ -3071,4 +3091,13 @@ +@@ -3071,4 +3093,13 @@ this.logger.logIncorrectClasspath(currentPath); } } diff --git a/eclipse.spec b/eclipse.spec index 93336b7..9a8dc4a 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -19,7 +19,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 31%{?dist} +Release: 32%{?dist} License: Eclipse Public License Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1730,6 +1730,9 @@ fi %{_libdir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Fri Jan 26 2007 Ben Konrath 3.2.1-32 +- Fix bug in ecj [] patch. + * Tue Jan 16 2007 Ben Konrath 3.2.1-31 - Add bugzilla reference to remove jars bug in comment. - Update bugzilla refereces to [] bugs.