From ba7a4bbce4ccc2e64be13edcca2c6a959efeca28 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@fedoraproject.org>
Date: May 18 2010 20:49:39 +0000
Subject: * Tue May 18 2010 Jeff Johnston  <jjohnstn@redhat.com> 1:6.0.2-5

- Rebase Autotools/Libhover to Linux tools R0.5.1.
- Remove addbuilder patch which is already part of R0_5_1.
- Remove libhover template patch which is already part of R0_5_1.

---

diff --git a/.cvsignore b/.cvsignore
index b116f06..7b9002e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -44,3 +44,5 @@ eclipse-cdt-fetched-src-libhover-R0_4_0.tar.gz
 eclipse-cdt-fetched-src-v201002161416.tar.bz2
 eclipse-cdt-fetched-src-autotools-R0_5_0.tar.gz
 eclipse-cdt-fetched-src-libhover-R0_5_0.tar.gz
+eclipse-cdt-fetched-src-autotools-R0_5_1.tar.gz
+eclipse-cdt-fetched-src-libhover-R0_5_1.tar.gz
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index ffeb0df..8248ef3 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
@@ -36,10 +36,10 @@ Requires:       eclipse-platform
 Source0: %{name}-fetched-src-v%{build_id}.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: %{name}-fetched-src-autotools-R0_5_0.tar.gz
+Source1: %{name}-fetched-src-autotools-R0_5_1.tar.gz
 Source14: make-autotools-tarball.sh
 
-Source2: %{name}-fetched-src-libhover-R0_5_0.tar.gz
+Source2: %{name}-fetched-src-libhover-R0_5_1.tar.gz
 Source15: make-libhover-tarball.sh
 
 ## The following tarball was generated thusly:
@@ -115,13 +115,6 @@ Patch20: %{name}-disable-mylyn.patch
 # This can be removed for CDT 7.0.
 Patch21: %{name}-maketargets.patch
 
-# Fix for Autotools bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=306406
-# Can be removed once Autotools moves to R0_5_1 or higher.
-Patch22: %{name}-addbuilder.patch
-
-# Fix for Libhover bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=306283
-Patch23: %{name}-libhover-template.patch
-
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-rse >= 3.0
 BuildRequires:  java-devel >= 1.4.2
@@ -224,7 +217,6 @@ pushd autotools
 tar -xzf %{SOURCE1}
 %patch19 -p0
 pushd org.eclipse.linuxtools.cdt.autotools.core
-%patch22 -p0
 mkdir macros
 pushd macros
 cp %{SOURCE8} .
@@ -246,7 +238,6 @@ rm -rf org.eclipse.linuxtools.cdt.libhover.newlib
 rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature
 %patch14 -p0
 pushd org.eclipse.linuxtools.cdt.libhover
-%patch23 -p0
 mkdir libhoverdocs
 pushd libhoverdocs
 cp %{SOURCE6} .
@@ -598,6 +589,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Tue May 18 2010 Jeff Johnston  <jjohnstn@redhat.com> 1:6.0.2-5
+- Rebase Autotools/Libhover to Linux tools R0.5.1.
+- Remove addbuilder patch which is already part of R0_5_1.
+- Remove libhover template patch which is already part of R0_5_1.
+
 * Thu May 06 2010 Jeff Johnston  <jjohnstn@redhat.com> 1:6.0.2-4
 - Add libtool as a requirement.
 
diff --git a/make-autotools-tarball.sh b/make-autotools-tarball.sh
index 558fd22..b79121c 100755
--- a/make-autotools-tarball.sh
+++ b/make-autotools-tarball.sh
@@ -2,11 +2,13 @@
 rel=$1
 tag=`echo $rel | sed -e 's/\./_/g'`
 echo $tag
-mkdir -p temp && cd temp
+mkdir -p temp
+pushd temp
 rm -rf autotools
 svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/tags/$rel autotools
-cd autotools
+pushd autotools
 pwd
 rm -rf org.eclipse.linuxtools.cdt.autotools.tests
 tar -czvf eclipse-cdt-fetched-src-autotools-$tag.tar.gz org.eclipse.linuxtools.cdt.autotools*
-
+popd
+popd
diff --git a/make-libhover-tarball.sh b/make-libhover-tarball.sh
index 431510a..6a89008 100755
--- a/make-libhover-tarball.sh
+++ b/make-libhover-tarball.sh
@@ -2,12 +2,14 @@
 rel=$1
 tag=`echo $rel | sed -e 's/\./_/g'`
 echo $tag
-mkdir -p temp && cd temp
+mkdir -p temp
+pushd temp
 rm -rf libhover
 svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/tags/$rel libhover
-cd libhover
+pushd libhover
 pwd
 # We don't want newlib libhover shipped unconditionally
 rm -rf org.eclipse.linuxtools.cdt.libhover.newlib*
 tar -czvf eclipse-cdt-fetched-src-libhover-$tag.tar.gz org.eclipse.linuxtools.cdt.libhover*
-
+popd
+popd
diff --git a/sources b/sources
index 664ea9a..cc3d072 100644
--- a/sources
+++ b/sources
@@ -11,3 +11,5 @@ f5c671311f49cdb33eaaa64ab6d781fa  ammacros-1.9.6.xml
 c42f55b60cdb4410b6c5a5201357e7b8  eclipse-cdt-fetched-src-v201002161416.tar.bz2
 b521cd872ec5776d743a38318a4cbe3e  eclipse-cdt-fetched-src-autotools-R0_5_0.tar.gz
 6a21a7b465d9abce8064186f1ba601c6  eclipse-cdt-fetched-src-libhover-R0_5_0.tar.gz
+dc6dec7fa6a435d7f441b2e4e41f6a4a  eclipse-cdt-fetched-src-autotools-R0_5_1.tar.gz
+b683c120c1c13b56e6992e6b2fc6083c  eclipse-cdt-fetched-src-libhover-R0_5_1.tar.gz