[eclipse-cdt/f14] Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660

[Jeff Johnston]

commit d9845bd4bf589e361ddeac2727acec1117924c2c
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Thu Jul 21 16:58:46 2011 -0400

    Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660

 eclipse-cdt-autotools-reconfigure.patch |   21 +++++++++++++++++++++
 eclipse-cdt.spec                        |   12 ++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-cdt-autotools-reconfigure.patch b/eclipse-cdt-autotools-reconfigure.patch
new file mode 100644
index 0000000..a421aad
--- /dev/null
+++ b/eclipse-cdt-autotools-reconfigure.patch
@@ -0,0 +1,21 @@
+diff --git a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
+index 2676526..261fef6 100644
+--- a/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
++++ b/autotools/org.eclipse.linuxtools.cdt.autotools.core/src/org/eclipse/linuxtools/internal/cdt/autotools/core/AutotoolsNewMakeGenerator.java
+@@ -1251,10 +1251,12 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
+ 			if (!isValidTarget(targetName, makeTargetManager))
+ 				continue;
+ 			try {
+-				IMakeTarget makeTarget = makeTargetManager.findTarget(project, targetName);
+-				if (makeTarget == null)
+-					makeTarget = makeTargetManager.createTarget(
+-						project, targetName, targetBuildID);
++				// Bug #351660 - always create a new MakeTarget because an
++				// existing MakeTarget will cause events to occur on every
++				// modification whereas a new MakeTarget not yet added will
++				// not cause this delay.
++				IMakeTarget makeTarget = makeTargetManager.createTarget(
++								project, targetName, targetBuildID);
+ 				makeTarget.setContainer(project);
+ 				makeTarget.setStopOnError(isStopOnError);
+ 				makeTarget.setRunAllBuilders(false);
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 77cc32e..e9d679e 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -107,7 +107,11 @@ Patch18: %{name}-debugSpawnerBug.patch
 # in the plugin.
 Patch19: %{name}-autotools-local.patch
 
-BuildRequires: eclipse-pde >= 3.6.0
+# Patch for autotools reconfiguring delay issue
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
+Patch20: %{name}-autotools-reconfigure.patch
+
+BuildRequires: eclipse-pde >= 1:3.6.0
 BuildRequires: eclipse-rse >= 3.1.1
 BuildRequires:  java-devel >= 1.4.2
 BuildRequires: objectweb-asm >= 3.2
@@ -205,6 +209,7 @@ mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
 %patch19 -p0
+%patch20 -p2
 pushd org.eclipse.linuxtools.cdt.autotools.core
 mkdir macros
 pushd macros
@@ -575,6 +580,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Jul 21 2011 Jeff Johnston  <jjohnstn at redhat.com> 1:7.0.1-8
+- Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=351660
+
 * Thu May 26 2011 Jeff Johnston  <jjohnstn at redhat.com> 1:7.0.1-7
 - Bump release.