[eclipse-cdt/f17: 10/11] Update CDT to Juno 8.1.2 release.

[Jeff Johnston]

commit bf7a10e316abe66fd0727ccaa5859fa45a979830
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Mon May 6 17:26:42 2013 -0400

    Update CDT to Juno 8.1.2 release.
    
    - Update libhover to Linux Tools 1.2.1 release.

 eclipse-cdt.spec |   26 +++++++++++++++-----------
 sources          |    4 ++--
 2 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 8933f92..f21e139 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -5,11 +5,11 @@ Epoch: 1
 %define major                   8
 %define minor                   1       
 %define majmin                  %{major}.%{minor}
-%define micro                   0
+%define micro                   2
+%define cdt_snapshot            org.eclipse.cdt-CDT_8_1_2
+%define build_id                201302132326
+%define libhover_build_id       201302051708
 %define eclipse_base            %{_libdir}/eclipse
-%define cdt_snapshot		org.eclipse.cdt-CDT_8_1_0
-%define build_id		201206111645
-%define libhover_build_id	201206130106
 %define pdebuild		eclipse-pdebuild
 
 
@@ -35,10 +35,10 @@ Requires:       eclipse-platform
 
 
 # The following tarball was fetched via:
-# http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-CDT_8_1_0.tar.bz2
+# http://git.eclipse.org/c/cdt/org.eclipse.cdt.git/snapshot/org.eclipse.cdt-CDT_8_1_2.tar.bz2
 Source0: %{cdt_snapshot}.tar.bz2
 
-Source2: http://download.eclipse.org/linuxtools/1.0.0-sources/linuxtools-libhover-parent-1.0.0-src.tar.bz2
+Source2: http://download.eclipse.org/linuxtools/1.2.1-sources/linuxtools-libhover-parent-1.2.1-src.tar.bz2
 
 # Script to run the tests in Xvnc
 Source5: %{name}-runtests.sh
@@ -126,7 +126,7 @@ popd
 
 ## Libhover stuff
 tar -xaf %{SOURCE2}
-pushd linuxtools-libhover-parent-1.0.0-src
+pushd linuxtools-libhover-parent-1.2.1-src
 # newlib libhover is an optional feature...remove it from CDT base
 rm -rf org.eclipse.linuxtools.cdt.libhover.newlib
 rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature
@@ -178,11 +178,11 @@ popd
 mvn-rpmbuild -o -DforceContextQualifier=%{build_id} -fae clean install
 
 ## Libhover has dependencies on CDT so we must add these to the SDK directory
-unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip -d $SDK
+unzip -o releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo-8.1.1-SNAPSHOT.zip -d $SDK
 popd
 
 ## Libhover build
-pushd linuxtools-libhover-parent-1.0.0-src
+pushd linuxtools-libhover-parent-1.2.1-src
 %{pdebuild} -f org.eclipse.linuxtools.cdt.libhover.feature  -a "-DbaseLocation=$SDK -DforceContextQualifier=%{libhover_build_id}"
 %{pdebuild} -f org.eclipse.linuxtools.cdt.libhover.devhelp.feature  \
 -a "-DbaseLocation=$SDK -DjavacSource=1.6 -DjavacTarget=1.6 \
@@ -202,7 +202,7 @@ install -d -m755 $parsersInstallDir
 install -d -m755 $sdkInstallDir
 
 # Unzip contents of the cdt repo, removing all but plugins and features
-unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo.zip \
+unzip -q -o %{cdt_snapshot}/releng/org.eclipse.cdt.repo/target/org.eclipse.cdt.repo-8.1.1-SNAPSHOT.zip \
 -d $installDir/eclipse
 
 # Unpack all existing feature jars
@@ -217,7 +217,7 @@ done
 cp %{cdt_snapshot}/core/org.eclipse.cdt.core.tests/target/org.eclipse.cdt.core.tests-*-SNAPSHOT.jar $installDir/eclipse/plugins
 
 # Libhover install
-pushd linuxtools-libhover-parent-1.0.0-src
+pushd linuxtools-libhover-parent-1.2.1-src
 unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip
 unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.devhelp.feature.zip
 popd
@@ -269,6 +269,10 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Mon May 06 2013 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.2-1
+- Update CDT to Juno 8.1.2 release.
+- Update libhover to Linux Tools 1.2.1 release.
+
 * Tue Jul 03 2012 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.0-1
 - Update CDT to official Juno 8.1.0 release.
 - Update libhover to Linux Tools 1.0.0 release.
diff --git a/sources b/sources
index 0daf88b..65651e2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 921f3464c4b5a284473ebdad634e5c2d  libstdc++-v3.libhover
-b8d709a53f2213a8f39c9c25bd8b2f72  linuxtools-libhover-parent-1.0.0-src.tar.bz2
-ba6b1cb3cb2685b9efd8990e34e3e495  org.eclipse.cdt-CDT_8_1_0.tar.bz2
+53aeaaff88481e90b9f80866474f4c27  org.eclipse.cdt-CDT_8_1_2.tar.bz2
+95900438eb97a8145dfd5e0add9075bd  linuxtools-libhover-parent-1.2.1-src.tar.bz2