[eclipse-webtools] Use forceContextQualifier instead of git

[Gerard Ryan]

commit 7d8898aa4a6f6333180b837f320ee754252046f1
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Tue Aug 12 23:05:58 2014 +0100

    Use forceContextQualifier instead of git

 eclipse-webtools.spec |   22 +++++++++-------------
 sources               |    2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/eclipse-webtools.spec b/eclipse-webtools.spec
index 7063698..2f55d9a 100644
--- a/eclipse-webtools.spec
+++ b/eclipse-webtools.spec
@@ -1,8 +1,9 @@
 %global install_loc           %{_datadir}/eclipse/dropins
+%global qualifier             $(date +%G%m%d%H%M)
 
 Name:           eclipse-webtools
 Version:        3.6.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Eclipse Webtools Projects
 
 License:        EPL
@@ -17,7 +18,8 @@ BuildArch:      noarch
 # find webtools.releng.aggregator/ -name *.class -type f -delete
 # find webtools.releng.aggregator/ -name *.zip -type f -delete
 # rm -rf webtools.releng.aggregator/webtools.releng/releng.wtptools/api/org.eclipse.wtp.releng.wtpbuilder/
-# tar cfJv eclipse-webtools-3.6.0.tar.xz webtools.releng.aggregator/
+# mkdir eclipse-webtools-3.6.0/ && cp -R pom.xml webtools.* wtp-parent/ eclipse-webtools-3.6.0/
+# tar cfJv eclipse-webtools-3.6.0.tar.xz eclipse-webtools-3.6.0/
 Source0:        %{name}-%{version}.tar.xz
 
 # Missing plugin (maybe this should be provided by eclipselink package in future)
@@ -225,7 +227,7 @@ Obsoletes:      eclipse-wtp-jpa-sdk <= 3.5.1-3
 Dali Java Persistence Tools with JPA and JAXB Support.
 
 %prep
-%setup -q -n webtools.releng.aggregator
+%setup -q
 
 tar xfj %{SOURCE1}
 pushd eclipselink.runtime-7816e2b523adf5e65ad0c245f13ca4b59ff329f2/
@@ -237,15 +239,6 @@ find -name *.class -type f -delete
 find -name *.jar -type f -delete
 find -name *.zip -type f -delete
 
-# Tycho generates build version qualifier from latest commit, so
-# org.eclipse.persistence.jpa.jpql needs to be committed
-pushd webtools.dali
-git config --global user.email "eclipse-webtools at fedoraproject.org"
-git config --global user.name "Eclipse Webtools Package"
-git add jpa/plugins/org.eclipse.persistence.jpa.jpql
-git commit -m "Add org.eclipse.persistence.jpa.jpql"
-popd
-
 # Configure org.eclipse.persistence.jpa.jpql to be built as part of this build
 %pom_xpath_inject pom:project/pom:modules \
     "<module>jpa/plugins/org.eclipse.persistence.jpa.jpql</module>" webtools.dali
@@ -403,7 +396,7 @@ sed -i -e "s/javax.wsdl/javax.wsdl;bundle-version=\"[1.5.0,1.6.0)\"/" \
 
 # Skipping tests because of missing test dependencies & removed bundled jars
 %build
-%mvn_build -j -f
+%mvn_build -j -f -- -DforceContextQualifier=%{qualifier}
 
 %install
 for pkg in common-core common servertools-core servertools sourceediting webservices javaee jsf dali
@@ -910,6 +903,9 @@ ln -s %{_javadir}/velocity.jar \
 %{install_loc}/webtools-dali
 
 %changelog
+* Tue Aug 12 2014 Gerard Ryan <gerard at ryan.lt> - 3.6.0-6
+- Use forceContextQualifier instead of git
+
 * Sat Jul 19 2014 Gerard Ryan <gerard at ryan.lt> - 3.6.0-5
 - Add features from webtools.webservices.jaxws
 
diff --git a/sources b/sources
index 71524f8..878290b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5bbcde12d3bb494188cd1c709aa75664  eclipse-webtools-3.6.0.tar.xz
+8b8ae96d325d3cf2060b173876477dbf  eclipse-webtools-3.6.0.tar.xz
 24b447da18a916d63632f4d7ebeac4d2  eclipselink.runtime-7816e2b523adf5e65ad0c245f13ca4b59ff329f2.tar.bz2