rpms/eclipse-cdt/devel eclipse-cdt-autotools-bug280117.patch, NONE, 1.1 eclipse-cdt.spec, 1.121, 1.122

[Jeff Johnston]

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19274

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-autotools-bug280117.patch 
Log Message:

* Mon Jun 15 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-3
- Resolves #280117.




eclipse-cdt-autotools-bug280117.patch:

--- NEW FILE eclipse-cdt-autotools-bug280117.patch ---
diff -up ./src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java.fix ./src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java
--- ./src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java.fix	2009-06-15 15:41:38.000000000 -0400
+++ ./src/org/eclipse/linuxtools/cdt/autotools/AutotoolsScannerInfo.java	2009-06-15 15:42:10.000000000 -0400
@@ -105,8 +105,8 @@ public class AutotoolsScannerInfo implem
 					String id = options[i].getId();
 					if (id.indexOf("builddir") > 0) { // $NON-NLS-1$
 						runPath = makefile.getProject().getLocation().append(value.trim());
+						done = true;
 					}
-					done = true;
 				}
 			} catch (BuildException e) {
 				// do nothing


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- eclipse-cdt.spec	9 Apr 2009 16:12:24 -0000	1.121
+++ eclipse-cdt.spec	15 Jun 2009 21:31:41 -0000	1.122
@@ -20,7 +20,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -94,6 +94,10 @@ Patch15: %{name}-managedConfigurations.p
 # the .cproject file.  This patch prevents the problem.
 Patch16: %{name}-managedConfigurations-fix.patch
 
+# Following is a patch for Eclipse bug 280117 which fixes the Autotools
+# ScannerInfo.
+Patch17: %{name}-autotools-bug280117.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 %if %{gcj_support}
@@ -222,6 +226,9 @@ popd
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
+pushd org.eclipse.linuxtools.cdt.autotools
+%patch17 -p0
+popd
 popd
 
 ## Libhover stuff
@@ -566,6 +573,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 15 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-3
+- Resolves #280117.
+
 * Wed Apr 08 2009 Jeff Johnston <jjohnstn at redhat.com> 5.0.2-2
 - Bump release.