From 13be93855581972e9b4f8d24ef9536ffdc0921c5 Mon Sep 17 00:00:00 2001
From: Krzysztof Daniel <kdaniel@redhat.com>
Date: Apr 17 2012 13:19:32 +0000
Subject: Move to eclipse 4.2. & Build help.


Conflicts:
	eclipse-mylyn.spec

---

diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 8487a0f..963e4c3 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -1,4 +1,3 @@
-%global eclipse_base        %{_libdir}/eclipse
 %global install_loc         %{_datadir}/eclipse/dropins
 # Taken from update site so we match upstream
 #  http://download.eclipse.org/mylyn/archive/3.6.3/v20110608-1400/
@@ -8,7 +7,7 @@
 Name: eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
 Version: 3.7.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
@@ -22,19 +21,19 @@ BuildArch: noarch
 %endif
 
 BuildRequires: java-devel >= 1.7.0
-BuildRequires: eclipse-platform >= 1:3.8.0
-BuildRequires: eclipse-pde >= 1:3.8.0
-BuildRequires: eclipse-rcp >= 1:3.8.0-0.21
-BuildRequires: eclipse-mylyn-commons >= 3.7.0-4
+BuildRequires: eclipse-platform >= 1:4.2.0
+BuildRequires: eclipse-pde >= 1:4.2.0-0.6
+BuildRequires: eclipse-rcp >= 1:4.2.0-0.6
+BuildRequires: eclipse-mylyn-commons >= 3.7.0-9
 
-BuildRequires: rome
-BuildRequires: jdom
+BuildRequires: rome >= 0.9-9
+BuildRequires: jdom >= 1.1.2-3
 
-Requires: eclipse-platform >= 1:3.8.0
-Requires: eclipse-mylyn-commons >= 3.7.0-4
-Requires: eclipse-rcp >= 1:3.8.0-0.21
-Requires: rome
-Requires: jdom
+Requires: eclipse-platform >= 1:4.2.0
+Requires: eclipse-mylyn-commons >= 3.7.0-9
+Requires: eclipse-rcp >= 1:4.2.0-0.6
+Requires: rome >= 0.9-9
+Requires: jdom >= 1.1.2-3
 
 Group: Development/Tools
 
@@ -53,7 +52,11 @@ ln -s %{_javadir}/rome*.jar
 popd
 
 %build
-%{eclipse_base}/buildscripts/pdebuild \
+eclipse-pdebuild -f org.eclipse.mylyn_feature \
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
+ -d "mylyn-commons" -o `pwd`/orbitDeps
+
+eclipse-pdebuild -f org.eclipse.mylyn.tasks.ide \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
  -d "mylyn-commons" -o `pwd`/orbitDeps
 
@@ -64,6 +67,8 @@ install -d -m 755 %{buildroot}%{install_loc}/mylyn
 unzip -q -o -d %{buildroot}%{install_loc}/mylyn \
  build/rpmBuild/org.eclipse.mylyn_feature.zip
 
+unzip -q -o -d %{buildroot}%{install_loc}/mylyn \
+ build/rpmBuild/org.eclipse.mylyn.tasks.ide.zip
 
 %files
 %{install_loc}/mylyn
@@ -71,6 +76,11 @@ unzip -q -o -d %{buildroot}%{install_loc}/mylyn \
 %doc org.eclipse.mylyn-feature/license.html
 
 %changelog
+* Fri Apr 13 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.7.0-3
+- Move to eclipse 4.2.
+- Build help.
+- Fix the minimum eclipse-rcp requirement
+
 * Mon Apr 2 2012 Krzysztof Daniel <kdaniel@redhat.com> 3.7.0-2
 - Bump version to fix upgradepath.
 
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index d4be190..6a391f9 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -23,7 +23,7 @@ done
 
 # remove sources we don't need
 pushd $RELEASE_TAG > /dev/null
-ls -1 | grep -vE '^org.eclipse.mylyn$|org.eclipse.mylyn.tasks.core|org.eclipse.mylyn.tasks.search|org.eclipse.mylyn-feature|org.eclipse.mylyn.tasks.ui|org.eclipse.mylyn.tasks.index.core|org.eclipse.mylyn.tasks.index.ui|org.eclipse.mylyn.tasks.search' | xargs rm -rf
+ls -1 | grep -vE '^org.eclipse.mylyn$|org.eclipse.mylyn.tasks.core|org.eclipse.mylyn.tasks.search|org.eclipse.mylyn-feature|org.eclipse.mylyn.tasks.ui|org.eclipse.mylyn.tasks.index.core|org.eclipse.mylyn.tasks.index.ui|org.eclipse.mylyn.tasks.search|org.eclipse.mylyn.tasks.ide-feature|org.eclipse.mylyn.tasks.bugs|org.eclipse.mylyn.help.ui' | xargs rm -rf
 popd > /dev/null
 
 FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
diff --git a/sources b/sources
index 011821b..8e9cf0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc309256a610036fb1a16a64f550c7fe  eclipse-mylyn-R_3_7_0-fetched-src.tar.bz2
+2e40f444fa4018ed1c38bcdb218a0bb1  eclipse-mylyn-R_3_7_0-fetched-src.tar.bz2