rpms/eclipse-cdt/F-9 eclipse-cdt-autotools-fixes.patch, NONE, 1.1 eclipse-cdt.spec, 1.92, 1.93

[Jeff Johnston]

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32685

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

* Fri Sep 12 2008 Jeff Johnston <jjohnstn at redhat.com> 4.0.3-2
- Fix autotools project nature reference
- Fix autotools project test
- Restrict build eclipse-pde to be less than 3.4.0.
- Resolves #461647, #461201



eclipse-cdt-autotools-fixes.patch:

--- NEW FILE eclipse-cdt-autotools-fixes.patch ---
diff -up ./plugin.xml.fix ./plugin.xml
--- ./plugin.xml.fix	2008-09-11 19:01:38.000000000 -0400
+++ ./plugin.xml	2008-09-11 19:01:53.000000000 -0400
@@ -754,7 +754,7 @@
          name="%AutotoolsNature.name"
          point="org.eclipse.core.resources.natures">
       <requires-nature
-            id="org.eclipse.cdt.managedbuilder.core.mangedBuildNature">
+            id="org.eclipse.cdt.managedbuilder.core.managedBuildNature">
       </requires-nature>
       <runtime>
          <run
diff -up ./src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java.fix ./src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java
--- ./src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java.fix	2008-09-11 19:02:23.000000000 -0400
+++ ./src/com/redhat/eclipse/cdt/autotools/AutotoolsMakefileBuilder.java	2008-09-11 19:05:40.000000000 -0400
@@ -50,6 +50,7 @@ public class AutotoolsMakefileBuilder ex
 	public static final String BUILDER_ID = AutotoolsPlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
 	public static final String MANAGED_BUILDER_ID = ManagedBuilderCorePlugin.getUniqueIdentifier() + "." + BUILDER_NAME; //$NON-NLS-1$
 	public static final String AUTOTOOLS_CONFIG_ID = AutotoolsPlugin.getUniqueIdentifier() + ".configuration.build"; //$NON-NLS-1$
+	public static final String AUTOTOOLS_PROJECT_TYPE_ID = AutotoolsPlugin.getUniqueIdentifier() + ".projectType"; //$NON-NLS-1$
 	
 	private static final String BUILD_FINISHED = "AutotoolsMakefileBuilder.message.finished";	//$NON-NLS-1$
 	private static final String TYPE_CLEAN = "AutotoolsMakefileBuilder.type.clean";	//$NON-NLS-1$
@@ -76,8 +77,7 @@ public class AutotoolsMakefileBuilder ex
 			// then return true.
 			if (project.getNature(ManagedCProjectNature.MNG_NATURE_ID) != null) {
 				IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(project);
-				IConfiguration config = info.getDefaultConfiguration();
-				if (config.getParent().getId().equals(AUTOTOOLS_CONFIG_ID)) {
+				if (info.getManagedProject().getProjectType().getId().equals(AUTOTOOLS_PROJECT_TYPE_ID)) {
 					AutotoolsProjectNature.addAutotoolsBuilder(project, new NullProgressMonitor());
 					AutotoolsPlugin.verifyScannerInfoProvider(project);
 					return true;


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-9/eclipse-cdt.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- eclipse-cdt.spec	7 Apr 2008 22:55:15 -0000	1.92
+++ eclipse-cdt.spec	12 Sep 2008 22:00:03 -0000	1.93
@@ -19,7 +19,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -107,8 +107,10 @@
 # Remove include of stropts.h in openpty.c as it is no longer included 
 # in glibc-headers package
 Patch12: %{name}-openpty.patch
+# Fixes for autotools plugin.
+Patch13: %{name}-autotools-plugin.patch
 
-BuildRequires: eclipse-pde
+BuildRequires: eclipse-pde < 3.4.0
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.2
 BuildRequires:  java-gcj-compat-devel >= 1.0.64
@@ -186,6 +188,9 @@
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
+pushd com.redhat.eclipse.cdt.autotools
+%patch13
+popd
 popd
 
 # Cppunit stuff
@@ -406,6 +411,12 @@
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
 
 %changelog
+* Fri Sep 12 2008 Jeff Johnston <jjohnstn at redhat.com> 4.0.3-2
+- Fix autotools project nature reference
+- Fix autotools project test
+- Restrict build eclipse-pde to be less than 3.4.0.
+- Resolves #461647, #461201
+
 * Fri Apr 04 2008 Jeff Johnston <jjohnstn at redhat.com> 4.0.3-1
 - Rebase to CDT 4.0.3
 - Patch openpty code to not reference stropts.h which is no longer shipped