[eclipse-wtp-common] Start building from upstream master for 3.5.0

[Gerard Ryan]

commit 717a7a1453e7078f6d6c19c27a91d85893863eea
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Thu May 23 22:04:01 2013 +0100

    Start building from upstream master for 3.5.0

 .gitignore              |    3 +++
 eclipse-wtp-common.spec |   47 ++++++++++++++++++++++++++++-------------------
 sources                 |    8 +++-----
 3 files changed, 34 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d36726..ac76dae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,6 @@ eclipse-wtp-common-HEAD-fetched-src.tar.bz2
 /webtools.common.tests-201208170133.tar.bz2
 /webtools.servertools-20130117_1051.tar.bz2
 /webtools.servertools-20130320_1628.tar.bz2
+/webtools.common-v201305151500.tar.bz2
+/webtools.common.snippets-v201208170133.tar.bz2
+/webtools.servertools-20130502_1436.tar.bz2
diff --git a/eclipse-wtp-common.spec b/eclipse-wtp-common.spec
index cfc29d7..253b47c 100644
--- a/eclipse-wtp-common.spec
+++ b/eclipse-wtp-common.spec
@@ -1,41 +1,47 @@
 %global install_loc			%{_datadir}/eclipse/dropins
 
+%global	common_tag			v201305151500
+%global	common_dir			webtools.common-%{common_tag}
+
+%global	snippets_tag		v201208170133
+%global	snippets_dir		webtools.common.snippets-%{snippets_tag}
+
 # servertools_tag must be the same as in eclipse-wtp-servertools pacakge
-%global servertools_tag		20130320_1628
+%global servertools_tag		20130502_1436
 %global servertools_dir		webtools.servertools-%{servertools_tag}
 
-%global	fproj_tag	201208170133
-%global	fproj_dir	webtools.common.fproj-%{fproj_tag}
+%global	fproj_tag			201208170133
+%global	fproj_dir			webtools.common.fproj-%{fproj_tag}
 
-%global	tests_tag	201208170133
-%global	tests_dir	webtools.common.tests-%{tests_tag}
+%global	tests_tag			201208170133
+%global	tests_dir			webtools.common.tests-%{tests_tag}
 
 Name:			eclipse-wtp-common
-Version:		3.4.2
-Release:		4%{?dist}
+Version:		3.5.0
+Release:		0.1%{?dist}
 Summary:		Common infrastructure and utilities developed and used with WTP
 
 License:		EPL
 URL:			http://www.eclipse.org/webtools/common/
-Source0:		http://git.eclipse.org/c/webtools-common/webtools.common.git/snapshot/R3_4_2.tar.bz2
+Source0:		http://git.eclipse.org/c/webtools-common/webtools.common.git/snapshot/%{common_dir}.tar.bz2
 Source1:		http://git.eclipse.org/c/webtools-common/webtools.common.fproj.git/snapshot/%{fproj_dir}.tar.bz2
-Source2:		http://git.eclipse.org/c/webtools-common/webtools.common.snippets.git/snapshot/R3_4_0.tar.bz2
+Source2:		http://git.eclipse.org/c/webtools-common/webtools.common.snippets.git/snapshot/%{snippets_dir}.tar.bz2
 Source3:		http://git.eclipse.org/c/webtools-common/webtools.common.tests.git/snapshot/%{tests_dir}.tar.bz2
 Source4:		http://git.eclipse.org/c/servertools/webtools.servertools.git/snapshot/%{servertools_dir}.tar.bz2
 
 BuildArch:		noarch
 
 BuildRequires:	java-devel >= 1.7.0
-BuildRequires:	eclipse-pde >= 4.2.0-0.10
-BuildRequires:	eclipse-platform >= 4.2.0-0.10
-BuildRequires:	eclipse-jdt >= 4.2.0-0.10
-BuildRequires:	eclipse-emf-xsd >= 2.8.0
-BuildRequires:	eclipse-gef >= 3.7.0
+BuildRequires:	eclipse-pde >= 4.3.0
+BuildRequires:	eclipse-platform >= 4.3.0
+BuildRequires:	eclipse-jdt >= 4.3.0
+BuildRequires:	eclipse-emf-xsd >= 2.9.0
+BuildRequires:	eclipse-gef >= 3.9.0
 BuildRequires:	eclipse-dtp >= 1.8.2
-Requires:		eclipse-platform >= 4.2.0-0.10
-Requires:		eclipse-jdt >= 4.2.0-10
-Requires:		eclipse-emf-xsd >= 2.8.0
-Requires:		eclipse-gef >= 3.8.0
+Requires:		eclipse-platform >= 4.3.0
+Requires:		eclipse-jdt >= 4.3.0
+Requires:		eclipse-emf-xsd >= 2.9.0
+Requires:		eclipse-gef >= 3.9.0
 Requires:		eclipse-dtp >= 1.8.2
 
 %description
@@ -62,7 +68,7 @@ else
 	CORE_RUNTIME_JAR=`ls /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*`
 fi
 
-pushd R3_4_2/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src
+pushd %{common_dir}/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src
 	javac -cp %{_javadir}/felix/org.osgi.core.jar:${CORE_RUNTIME_JAR} \
 		org/eclipse/perfmsr/core/*.java
 	jar cf ../perfmsr.jar org/
@@ -119,6 +125,9 @@ unzip -q -o -d %{buildroot}%{install_loc}/%{name} \
 
 
 %changelog
+* Thu May 23 2013 Gerard Ryan <galileo at fedoraproject.org> - 3.5.0-0.1
+- Start building from upstream master branches in anticipation for 3.5.0
+
 * Sat Apr 20 2013 Gerard Ryan <galileo at fedoraproject.org> - 3.4.2-4
 - Update to newer servertools tag to match eclipse-wtp-servertools
 
diff --git a/sources b/sources
index 4fd3e3c..840c84e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,3 @@
-8c07efc5bee8993d9769e1f4353ec174  R3_4_2.tar.bz2
-4eee4e87fdc9ecb69dfaca5405b97f71  R3_4_0.tar.bz2
-9500100ae6d8b9dffb21c94fbf49ad0b  webtools.common.fproj-201208170133.tar.bz2
-1a94c75a99183b49a5e7f5d94c36f09e  webtools.common.tests-201208170133.tar.bz2
-d598b4d53a82795905a6e59bd2929438  webtools.servertools-20130320_1628.tar.bz2
+e98593577d5e00354f852cf3e2d2588e  webtools.common-v201305151500.tar.bz2
+c3dfba5f15db01109b2bcfa3d3702d22  webtools.common.snippets-v201208170133.tar.bz2
+3c2b16b03c7f5ca6a29771dba58bba5e  webtools.servertools-20130502_1436.tar.bz2