[eclipse-cdt/f14/master] - Fix glibc and libstdc++ libhover plug-ins to specify a local location for their data.

[Jeff Johnston]

commit 563e4700639978039a04858186410160d89dc9d3
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Wed Feb 16 15:40:01 2011 -0500

    - Fix glibc and libstdc++ libhover plug-ins to specify a local
      location for their data.

 eclipse-cdt-libhover-local2.patch |   24 ++++++++++++++++++++++++
 eclipse-cdt.spec                  |   10 ++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
---
diff --git a/eclipse-cdt-libhover-local2.patch b/eclipse-cdt-libhover-local2.patch
new file mode 100644
index 0000000..a83547c
--- /dev/null
+++ b/eclipse-cdt-libhover-local2.patch
@@ -0,0 +1,24 @@
+diff -up ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml
+--- ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml.fix	2011-02-16 15:31:44.000000000 -0500
++++ ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml	2011-02-16 15:32:04.000000000 -0500
+@@ -7,7 +7,7 @@
+          point="org.eclipse.linuxtools.cdt.libhover.library">
+       <library
+             docs="http://www.gnu.org/software/libc/manual/html_node/index.html"
+-            location="http://www.sourceware.org/eclipse/libhover/glibc-2.7-2.libhover"
++            location="libhoverdocs/glibc-2.7-2.libhover"
+             name="glibc library"
+             type="C">
+       </library>
+diff -up ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml
+--- ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix	2011-02-16 15:32:18.000000000 -0500
++++ ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml	2011-02-16 15:32:51.000000000 -0500
+@@ -7,7 +7,7 @@
+          point="org.eclipse.linuxtools.cdt.libhover.library">
+       <library
+             docs="http://gcc.gnu.org/onlinedocs/libstdc++/manual/spine.html"
+-            location="http://www.sourceware.org/eclipse/libhover/libstdc++-v3.libhover"
++            location="libhoverdocs/libstdc++-v3.libhover"
+             name="libstdc++ library"
+             type="C++">
+       </library>
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 2fe77e1..83ca438 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:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -84,9 +84,10 @@ Source13: ammacros-1.9.6.xml
 # Add XML -> HTML generation after running tests
 Patch13: %{name}-testaggregation.patch
 
-# Following is a patch to supply libhover docs directory from the libhover
+# Following are patches to supply libhover docs directory from the libhover
 # plugin and not require html to access them.
 Patch14: %{name}-libhover-local.patch
+Patch15: %{name}-libhover-local2.patch
 
 # Patches for ppc64
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=272380
@@ -225,6 +226,7 @@ tar -xzf %{SOURCE2}
 rm -rf org.eclipse.linuxtools.cdt.libhover.newlib
 rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature
 %patch14 -p0
+%patch15 -p0
 pushd org.eclipse.linuxtools.cdt.libhover
 mkdir libhoverdocs
 pushd libhoverdocs
@@ -573,6 +575,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Feb 16 2011 Jeff Johnston  <jjohnstn at redhat.com> 1:7.0.1-5
+- Fix glibc and libstdc++ libhover plug-ins to specify a local
+  location for their data.
+
 * Mon Jan 31 2011 Jeff Johnston  <jjohnstn at redhat.com> 1:7.0.1-4
 - Switch to PRE 0.7 tag for autotools and libhover.