From 8c43b806df9fef09c0914d3711e7eecedf54a9bc Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@fedoraproject.org>
Date: Jun 06 2007 18:15:22 +0000
Subject: * Tue May 01 2007 Jeff Johnston <jjohnstn@redhat.com> 3.1.2-4

- Add patch to fix backwards text entry in new configure files.
- Resovles: #238493

---

diff --git a/eclipse-cdt-recursive-single-line-rule.patch b/eclipse-cdt-recursive-single-line-rule.patch
new file mode 100644
index 0000000..d8289ba
--- /dev/null
+++ b/eclipse-cdt-recursive-single-line-rule.patch
@@ -0,0 +1,17 @@
+--- ./com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java.fix	2007-05-01 17:53:06.000000000 -0400
++++ ./com.redhat.eclipse.cdt.autotools/src/com/redhat/eclipse/cdt/autotools/ui/editors/RecursiveSingleLineRule.java	2007-05-01 17:53:53.000000000 -0400
+@@ -125,10 +125,12 @@ public class RecursiveSingleLineRule ext
+ 	}
+ 	
+ 	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
+-		int column;
++		int column = scanner.getColumn();
++		// Check if we are at EOF, in which case rules don't hold
++		if (column < 0)
++			return Token.UNDEFINED;
+ 		if (!resume) {
+ 			evalIndex = 0;
+-			column = scanner.getColumn();
+ 			// Check if we are within outer rule boundaries.
+ 			if (column >= endIndex || column < startIndex) {
+ 				// If not, then we should evaluate to see if the
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index dec99a7..f0ada18 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -18,7 +18,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -86,6 +86,8 @@ Patch10: %{name}-cppunit-default-location.patch
 # Patch to ManagedMake builder to prevent running make after Makefile generation
 # failure.
 Patch11: %{name}-managedbuild-failcheck.patch
+# Patch to fix RecursiveSingleLineRule so it properly recognizes EOF
+Patch12: %{name}-recursive-single-line-rule.patch
 
 BuildRequires: eclipse-pde
 %if %{gcj_support}
@@ -153,6 +155,7 @@ popd
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
+%patch12 -p0
 popd
 
 # Cppunit stuff
@@ -315,6 +318,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
 
 %changelog
+* Tue May 01 2007 Jeff Johnston <jjohnstn@redhat.com> 3.1.2-4
+- Add patch to fix backwards text entry in new configure files.
+- Resovles: #238493
+
 * Mon Apr 16 2007 Jeff Johnston <jjohnstn@redhat.com> 3.1.2-3
 - Add missing gif to org.eclipse.cdt.make.ui.
 - Resolves: #236558