From 8e260af9fca48df9ad9307ef728d6a8312aa3c59 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@tonberry.(none)>
Date: Oct 07 2010 21:32:02 +0000
Subject: - Rebase CDT to Helios SR1 (7.0.1) including gdb hardware support

- Rebase Autotools/Libhover to Linux tools R0.6.1

---

diff --git a/.gitignore b/.gitignore
index 2369e9c..833f5bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ eclipse-cdt-fetched-src-libhover-R0_5_1.tar.gz
 eclipse-cdt-fetched-src-CDT_7_0_0.tar.bz2
 eclipse-cdt-fetched-src-libhover-R0_6_0.tar.gz
 eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz
+/eclipse-cdt-fetched-src-cdt_7_0_1.tar.bz2
+/eclipse-cdt-fetched-src-autotools-R0_6_1.tar.gz
+/eclipse-cdt-fetched-src-libhover-R0_6_1.tar.gz
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index d1c7fb2..09a5673 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -7,9 +7,9 @@ Epoch: 1
 %define major                   7
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   0
+%define micro                   1
 %define eclipse_base            %{_libdir}/eclipse
-%define build_id		201006141710
+%define build_id		201009241320
 
 
 # All arches line up except i386 -> x86
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -33,13 +33,13 @@ Requires:       eclipse-platform
 # script.  Note that the optional c99 and upc parsers plus the optional
 # xlc support features have been removed.
 
-Source0: %{name}-fetched-src-CDT_7_0_0.tar.bz2
+Source0: %{name}-fetched-src-cdt_7_0_1.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: %{name}-fetched-src-autotools-R0_6_0.tar.gz
+Source1: %{name}-fetched-src-autotools-R0_6_1.tar.gz
 Source14: make-autotools-tarball.sh
 
-Source2: %{name}-fetched-src-libhover-R0_6_0.tar.gz
+Source2: %{name}-fetched-src-libhover-R0_6_1.tar.gz
 Source15: make-libhover-tarball.sh
 
 ## The following tarball was generated thusly:
@@ -567,6 +567,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Oct 07 2010 Jeff Johnston  <jjohnstn@redhat.com> 1:7.0.1-2
+- Rebase CDT to Helios SR1 (7.0.1) including gdb hardware support
+- Rebase Autotools/Libhover to Linux tools R0.6.1
+
 * Wed Jul 14 2010 Jeff Johnston  <jjohnstn@redhat.com> 1:7.0.0-1
 - Rebase CDT to Helios (7.0.0)
 - Rebase Autotools/Libhover to Linux tools R0.6.0
diff --git a/fetch-cdt.sh b/fetch-cdt.sh
index 23ec161..1b0f0ed 100755
--- a/fetch-cdt.sh
+++ b/fetch-cdt.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -x
 
-CDTTAG=CDT_7_0_0
+CDTTAG=cdt_7_0_1
 #ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse
 
 if test x`uname -i` = 'xi386'; then export plat=""; else export plat=-`uname -i`; fi
@@ -13,13 +13,17 @@ mkdir -p home
 mkdir -p ws
 # we need to use a special svn pde extension to fetch some parts for the cdt build so we unzip a fresh 3.6 SDK and add the
 # special plug-in via the p2 director
+rm -rf sdk
 mkdir -p sdk
 pushd sdk
 wget http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201006080911/eclipse-SDK-3.6-linux-gtk${plat}.tar.gz
 tar -xzvf eclipse-SDK-3.6-linux-gtk${plat}.tar.gz
 ECLIPSEBASE=$TEMPDIR/sdk/eclipse
-pushd eclipse
-./eclipse -nosplash -consolelog -application org.eclipse.equinox.p2.director -repository http://download.eclipse.org/technology/subversive/0.7/pde-update-site/ -installIU org.eclipse.team.svn.pde.build.feature.group
+# pushd eclipse
+# ./eclipse -nosplash -consolelog -application org.eclipse.equinox.p2.director -repository http://download.eclipse.org/technology/subversive/0.7/pde-update-site/ -installIU org.eclipse.team.svn.pde.build.feature.group
+# popd
+pushd eclipse/plugins
+wget http://download.eclipse.org/technology/subversive/0.7/pde-update-site/plugins/org.eclipse.team.svn.pde.build_0.7.8.I20090525-1500.jar
 popd
 popd
 
diff --git a/sources b/sources
index cfd0f8a..d717a8e 100644
--- a/sources
+++ b/sources
@@ -11,3 +11,6 @@ f5c671311f49cdb33eaaa64ab6d781fa  ammacros-1.9.6.xml
 4585396f689035cae620c202437aa8af  eclipse-cdt-fetched-src-CDT_7_0_0.tar.bz2
 0e664e90fc9b65e1e428a1ef28ade7c7  eclipse-cdt-fetched-src-libhover-R0_6_0.tar.gz
 baf5d75e1edf754438c2163b454558f6  eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz
+e210eb0600d81609199667c2958c9983  eclipse-cdt-fetched-src-cdt_7_0_1.tar.bz2
+33d4062715041077b511bd94acc31e11  eclipse-cdt-fetched-src-autotools-R0_6_1.tar.gz
+8fc4a567257a8c001639f85ccd01f024  eclipse-cdt-fetched-src-libhover-R0_6_1.tar.gz