[eclipse-cdt/f17] Fix context qualifiers to match upstream CDT and Libhover.

[Jeff Johnston]

commit da8ba247bfcc6c765193db39582fad893116ab18
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Wed Apr 18 14:46:57 2012 -0400

    Fix context qualifiers to match upstream CDT and Libhover.

 eclipse-cdt.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 2d4b830..b077fab 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -9,6 +9,7 @@ Epoch: 1
 %define eclipse_base            %{_libdir}/eclipse
 %define cdt_snapshot		org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b
 %define build_id		201203191015
+%define libhover_build_id	201203221532
 
 
 # All arches line up except i386 -> x86
@@ -21,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.2.junom6%{?dist}
+Release:        0.3.junom6%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -177,7 +178,7 @@ pushd core/org.eclipse.cdt.core.linux/library
 make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE'
 popd
 
-mvn-rpmbuild -o -fae clean install
+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
@@ -185,7 +186,7 @@ popd
 
 ## Libhover build
 pushd linuxtools-libhover-parent-0.10.0-src
-eclipse-pdebuild -f org.eclipse.linuxtools.cdt.libhover.feature  -a "-DbaseLocation=$SDK"
+eclipse-pdebuild -f org.eclipse.linuxtools.cdt.libhover.feature  -a "-DbaseLocation=$SDK -DforceContextQualifier=%{libhover_build_id}"
 popd
 
 %install
@@ -318,6 +319,9 @@ popd
 %{eclipse_base}/dropins/cdt-parsers
 
 %changelog
+* Wed Apr 18 2012 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.0-0.3.junom6
+- Fix context qualifiers to match upstream CDT and Libhover.
+
 * Wed Apr 18 2012 Alexander Kurtakov <akurtako at redhat.com> 1:8.1.0-0.2.junom6
 - Remove unneeded cleanups.
 - Organize patches.