From aea6d520375e63a86a53b7b62f44057bacc20a6f Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@fedoraproject.org>
Date: Oct 16 2009 22:03:15 +0000
Subject: * Fri Oct 16 2009 Jeff Johnston  <jjohnstn@redhat.com> 1:6.0.1-4

- Rebase Autotools to 1.0.5.
- Add patch to move macro hover docs locally into Autotools plugin.

---

diff --git a/.cvsignore b/.cvsignore
index ea098b6..fc4b79b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -32,3 +32,10 @@ libstdc++-v3.libhover
 glibc-2.7-2.libhover
 eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
+eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
+acmacros-2.13.xml
+acmacros-2.59.xml
+acmacros-2.61.xml
+ammacros-1.4-p6.xml
+ammacros-1.9.5.xml
+ammacros-1.9.6.xml
diff --git a/eclipse-cdt-autotools-local.patch b/eclipse-cdt-autotools-local.patch
new file mode 100644
index 0000000..4661e6c
--- /dev/null
+++ b/eclipse-cdt-autotools-local.patch
@@ -0,0 +1,11 @@
+diff -up ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix ./org.eclipse.linuxtools.cdt.autotools/build.properties
+--- ./org.eclipse.linuxtools.cdt.autotools/build.properties.fix	2009-10-16 16:20:57.126201920 -0400
++++ ./org.eclipse.linuxtools.cdt.autotools/build.properties	2009-10-16 16:21:32.342201408 -0400
+@@ -5,6 +5,7 @@ bin.includes = plugin.xml,\
+                .,\
+                icons/,\
+                html/,\
++               macros/,\
+                plugin.properties,\
+                templates/
+ 
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 1724a09..1ff60c1 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:        3%{?dist}
+Release:        4%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -36,7 +36,7 @@ Requires:       eclipse-platform
 Source0: %{name}-fetched-src-CDT_6_0_1.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
 
 Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 
@@ -58,6 +58,14 @@ Source5: %{name}-runtests.sh
 Source6: glibc-2.7-2.libhover
 Source7: libstdc++-v3.libhover
 
+# Autotools docs to place locally
+Source8: acmacros-2.13.xml
+Source9: acmacros-2.59.xml
+Source10: acmacros-2.61.xml
+Source11: ammacros-1.4-p6.xml
+Source12: ammacros-1.9.5.xml
+Source13: ammacros-1.9.6.xml
+
 ## Patch to cppunit code to support double-clicking on file names, classes, and
 ## member names in the Hierarchy and Failure views such that the appropriate
 ## file will be opened and the appropriate line will be selected.
@@ -102,6 +110,10 @@ Patch17: %{name}-ppc64-add_xopen_source-include.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=291690
 Patch18: %{name}-discoverytab.patch
 
+# Following is a patch to autotools to supply macro hover docs locally
+# in the plugin.
+Patch19: %{name}-autotools-local.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
@@ -212,6 +224,18 @@ popd
 mkdir autotools
 pushd autotools
 tar -xzf %{SOURCE1}
+%patch19 -p0
+pushd org.eclipse.linuxtools.cdt.autotools
+mkdir macros
+pushd macros
+cp %{SOURCE8} .
+cp %{SOURCE9} .
+cp %{SOURCE10} .
+cp %{SOURCE11} .
+cp %{SOURCE12} .
+cp %{SOURCE13} .
+popd
+popd
 popd
 
 ## Libhover stuff
@@ -329,7 +353,7 @@ java -cp $SDK/startup.jar \
      -DjavacTarget=1.5 \
      -Duser.home=$homedir                        \
      -Dtype=feature                                    \
-     -Did=org.eclipse.linuxtools.cdt.autotools.feature \
+     -Did=org.eclipse.linuxtools.cdt.autotools \
      -DsourceDirectory=$(pwd)                          \
      -DbaseLocation=$SDK                               \
      -Dbuilder=$PDEDIR/templates/package-build  \
@@ -405,7 +429,7 @@ done
 
 # Autotools install
 pushd autotools
-unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.autotools.feature.zip
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.autotools.zip
 popd
 
 # Libhover install
@@ -599,6 +623,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Fri Oct 16 2009 Jeff Johnston  <jjohnstn@redhat.com> 1:6.0.1-4
+- Rebase Autotools to 1.0.5.
+- Add patch to move macro hover docs locally into Autotools plugin.
+
 * Thu Oct 15 2009 Jeff Johnston  <jjohnstn@redhat.com> 1:6.0.1-3
 - Include installed link for lpg java bundle in new cdt-parsers subpackage.
 
diff --git a/sources b/sources
index 51fe834..2f74aa1 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,13 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
-6cfdaee7d8ca1c14359225f7393e46ae  eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
 4bccad3ee92faaca4f8dc3ac6941434e  glibc-2.7-2.libhover
 2dbeff80a9c053b2888940a30f62d3f2  eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
 62e2dcbf8fb1f1b23cc71ae762b873b8  eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
+b273bf4bd39f9effb1cdf7e4cc68a1f0  eclipse-cdt-fetched-src-autotools-v200910161608.tar.gz
+992ad18bb8b4d95e5ecab9138dc379ae  acmacros-2.13.xml
+5bcf3e0c2a780b237bb06226eda7a4e7  acmacros-2.59.xml
+0e096b343447578000c73002dc448afa  acmacros-2.61.xml
+4404043432f7f30300139ce39288ba93  ammacros-1.4-p6.xml
+f6edf5299e6f0d89017bd295a296c2cd  ammacros-1.9.5.xml
+f5c671311f49cdb33eaaa64ab6d781fa  ammacros-1.9.6.xml