rpms/eclipse-cdt/devel eclipse-cdt-libhover-feature.patch, NONE, 1.1 eclipse-cdt-managedConfigurations.patch, NONE, 1.1 eclipse-cdt.spec, 1.109, 1.110

[Jeff Johnston]

Author: jjohnstn

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

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-libhover-feature.patch 
	eclipse-cdt-managedConfigurations.patch 
Log Message:

* Thu Oct 16 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-8
- Fix org.eclipse.linuxtools.libhover.feature to include
  org.eclipse.linuxtools.libhover.library_docs plugin.
- Add work-around patch for managed configurations dialog problem.



eclipse-cdt-libhover-feature.patch:

--- NEW FILE eclipse-cdt-libhover-feature.patch ---
diff -up ./feature.xml.fix ./feature.xml
--- ./feature.xml.fix	2008-10-16 13:09:31.000000000 -0400
+++ ./feature.xml	2008-10-16 13:09:40.000000000 -0400
@@ -131,10 +131,15 @@ Copyright © 2006 The Eclipse Foundation
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.linuxtools.cdt.libhover.library_docs"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
          id="org.eclipse.linuxtools.cdt.libhover.glibc"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         fragment="true"/>
+         version="0.0.0"/>
 
 </feature>

eclipse-cdt-managedConfigurations.patch:

--- NEW FILE eclipse-cdt-managedConfigurations.patch ---
Index: model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java,v
retrieving revision 1.63
diff -u -r1.63 CProjectDescriptionManager.java
--- model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java	28 Apr 2008 18:35:09 -0000	1.63
+++ model/org/eclipse/cdt/internal/core/settings/model/CProjectDescriptionManager.java	7 Oct 2008 19:32:38 -0000
@@ -1512,8 +1512,11 @@
 				ICStorageElement el = children[i];
 				if(CONFIGURATION.equals(el.getName())){
 					String id = el.getAttribute(CConfigurationSpecSettings.ID);
-					if(id != null)
-						map.put(id, el);
+					if(id != null) {
+						ICStorageElement el2 = (ICStorageElement)map.put(id, el);
+						if (el2 != null && el2 != el)
+							map.put(id, el2);
+					}
 				}
 			}
 		}


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- eclipse-cdt.spec	15 Oct 2008 23:08:47 -0000	1.109
+++ eclipse-cdt.spec	16 Oct 2008 17:24:52 -0000	1.110
@@ -20,7 +20,7 @@
 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
@@ -72,6 +72,9 @@
 ## been removed in CDT 4.0.
 #Patch11: %{name}-cppunit-env-tab.patch
 
+# Fix missing library-docs plug-in in libhover feature
+Patch5: %{name}-libhover-feature.patch
+
 # Remove include of stropts.h in openpty.c as it is no longer included 
 # in glibc-headers package
 Patch12: %{name}-openpty.patch
@@ -86,6 +89,12 @@
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=130235
 Patch14: %{name}-noLexerTests.patch
 
+# Following is work-around patch for managed configuration dialog creating
+# extraneous default configurations with same id as user-modified ones in
+# the .cproject file.  This patch changes it so first configuration with id
+# is used instead of last configuration with id.
+Patch15: %{name}-managedConfigurations.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 %if %{gcj_support}
@@ -170,6 +179,12 @@
 %patch14
 popd
 
+# Following is a workaround patch for managed configurations dialog
+# creating extraneous default configurations with same id as user-defined ones
+pushd results/plugins/org.eclipse.cdt.core
+%patch15
+popd
+
 # Only build the sdk
 offset=0; 
 for line in $(grep -no "value=.*platform" build.xml); do
@@ -210,6 +225,9 @@
 mkdir libhover
 pushd libhover
 tar -xzf %{SOURCE2}
+pushd org.eclipse.linuxtools.cdt.libhover.feature
+%patch5
+popd
 popd
 
 ## Cppunit stuff
@@ -549,6 +567,11 @@
 %endif
 
 %changelog
+* Thu Oct 16 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-8
+- Fix org.eclipse.linuxtools.libhover.feature to include
+  org.eclipse.linuxtools.libhover.library_docs plugin.
+- Add work-around patch for managed configurations dialog problem.
+
 * Wed Oct 15 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-7
 - Change to use new linuxtools version of autotools-1.0.1.
 - Add build of libhover plugins again from linuxtools.