[eclipse-mylyn] - Update to upstream's 3.6.0 release.

Wed Jul 13 21:19:43 UTC 2011

commit 03130d6902bff89085859f8f195fd3f3a756759d
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Wed Jul 13 17:19:29 2011 -0400

    - Update to upstream's 3.6.0 release.

 .gitignore             |    1 +
 eclipse-mylyn.spec     |   30 +++++++++++++++++++-------
 fetch-eclipse-mylyn.sh |   54 ++++++++++++++++++++++-------------------------
 sources                |    2 +-
 4 files changed, 49 insertions(+), 38 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 3926427..5f0ced1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ org.eclipse.mylyn-R_3_4_1-fetched-src.tar.bz2
 /org.eclipse.mylyn-R_3_4_2-fetched-src.tar.bz2
 eclipse-mylyn-R_3_5_0-fetched-src.tar.bz2
 eclipse-mylyn-R_3_5_1-fetched-src.tar.bz2
+eclipse-mylyn-R_3_6_0-fetched-src.tar.bz2
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index 17c49cf..1712035 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -6,13 +6,13 @@
 
 Name: eclipse-mylyn
 Summary: Eclipse Mylyn main feature.
-Version: 3.5.1
+Version: 3.6.0
 Release: 1%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
 # bash fetch-eclipse-mylyn.sh
-Source0: eclipse-mylyn-R_3_5_1-fetched-src.tar.bz2
+Source0: eclipse-mylyn-R_3_6_0-fetched-src.tar.bz2
 Source1: fetch-eclipse-mylyn.sh
 
 BuildArch: noarch
@@ -20,10 +20,14 @@ BuildArch: noarch
 BuildRequires: java-devel >= 1.5.0
 BuildRequires: eclipse-platform >= 1:3.4.0
 BuildRequires: eclipse-pde >= 1:3.4.0
-BuildRequires: eclipse-mylyn-commons >= 3.5.0
+BuildRequires: eclipse-mylyn-commons >= 3.6.0
+BuildRequires: rome
+BuildRequires: jdom
 
 Requires: eclipse-platform >= 1:3.4.0
-Requires: eclipse-mylyn-commons >= 3.5.0
+Requires: eclipse-mylyn-commons >= 3.6.0
+Requires: rome
+Requires: jdom
 
 Group: Development/Tools
 
@@ -33,12 +37,18 @@ for certain task repositories and monitors work activity to hide
 information that is not relevant to the current task.
 
 %prep
-%setup -c
+%setup -q -n eclipse-mylyn-R_3_6_0-fetched-src
+rm -rf orbitDeps
+mkdir orbitDeps
+pushd orbitDeps
+ln -s %{_javadir}/jdom.jar
+ln -s %{_javadir}/rome*.jar
+popd
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn_feature \
  -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -d "mylyn-commons"
+ -d "mylyn-commons" -o `pwd`/orbitDeps
 
 %install
 rm -rf %{buildroot}
@@ -49,13 +59,17 @@ install -d -m 755 %{buildroot}%{install_loc}/mylyn
 unzip -q -o -d %{buildroot}%{install_loc}/mylyn \
  build/rpmBuild/org.eclipse.mylyn_feature.zip
 
+
 %files
 %defattr(-,root,root,-)
 %{install_loc}/mylyn
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/epl-v10.html
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/license.html
+%doc org.eclipse.mylyn-feature/epl-v10.html
+%doc org.eclipse.mylyn-feature/license.html
 
 %changelog
+* Wed Jul 13 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.6.0-1
+- Update to upstream's 3.6.0 release.
+
 * Tue Apr 26 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.5.1-1
 - Update to upstream 3.5.1.
 
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index 1d5187b..f7a66f8 100644
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -5,37 +5,33 @@
 # 
 # Note:
 # eclipse-mylyn-commons needs to be built prior to this package.
-RELEASE_TAG="R_3_5_1"
+RELEASE_TAG="R_3_6_0"
 
-rm -fr org.eclipse.mylyn.contexts
-# get sources from org.eclipse.mylyn.contexts repo
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/mylyn \
-export -r ${RELEASE_TAG} org.eclipse.mylyn.contexts/org.eclipse.mylyn.context.core;
+rm -rf org.eclipse.mylyn.context.tar.bz2
+rm -rf org.eclipse.mylyn.tasks.tar.bz2
+rm -rf org.eclipse.mylyn.commons.tar.bz2
 
-rm -fr org.eclipse.mylyn.commons
-# get sources from org.eclipse.mylyn.commons repo
-for f in \
-org.eclipse.mylyn \
-org.eclipse.mylyn.discovery.core \
-org.eclipse.mylyn.discovery.ui \
-org.eclipse.mylyn.monitor.core \
-org.eclipse.mylyn.monitor.ui; do
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/mylyn \
-export -r ${RELEASE_TAG} org.eclipse.mylyn.commons/$f;
-done
+wget -O org.eclipse.mylyn.commons.tar.bz2 http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.commons.git/snapshot/${RELEASE_TAG}.tar.bz2
+wget -O org.eclipse.mylyn.context.tar.bz2 http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.context.git/snapshot/${RELEASE_TAG}.tar.bz2
+wget -O org.eclipse.mylyn.tasks.tar.bz2 http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.tasks.git/snapshot/${RELEASE_TAG}.tar.bz2
 
-rm -fr org.eclipse.mylyn.tasks
-# get sources from org.eclipse.mylyn.tasks repo
-for f in org.eclipse.mylyn.tasks.core \
-org.eclipse.mylyn.tasks.search \
-org.eclipse.mylyn-feature \
-org.eclipse.mylyn.tasks.ui; do
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/mylyn \
-export -r ${RELEASE_TAG} org.eclipse.mylyn.tasks/$f;
+for i in org.eclipse.mylyn.tasks.tar.bz2 \
+         org.eclipse.mylyn.context.tar.bz2 \
+         org.eclipse.mylyn.commons.tar.bz2; do
+  tar -xjf $i
 done
 
-rm -f eclipse-mylyn-${RELEASE_TAG}-fetched-src.tar.bz2
-tar cjf eclipse-mylyn-${RELEASE_TAG}-fetched-src.tar.bz2 \
-	org.eclipse.mylyn.contexts \
-	org.eclipse.mylyn.commons \
-	org.eclipse.mylyn.tasks
+# remove sources we don't need
+pushd $RELEASE_TAG > /dev/null
+ls -1 | grep -vE 'org.eclipse.mylyn.context.core|^org.eclipse.mylyn$|org.eclipse.mylyn.discovery.core|org.eclipse.mylyn.discovery.ui|org.eclipse.mylyn.monitor.core|org.eclipse.mylyn.monitor.ui|org.eclipse.mylyn.tasks.core|org.eclipse.mylyn.tasks.search|org.eclipse.mylyn-feature|org.eclipse.mylyn.tasks.ui' | xargs rm -rf
+popd > /dev/null
+
+FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
+mv $RELEASE_TAG $FETCHED_SOURCES_NAME
+rm -rf $FETCHED_SOURCES_NAME.tar.bz2
+tar -cjf $FETCHED_SOURCES_NAME.tar.bz2 $FETCHED_SOURCES_NAME
+
+rm -rf $FETCHED_SOURCES_NAME
+rm -rf org.eclipse.mylyn.context.tar.bz2
+rm -rf org.eclipse.mylyn.tasks.tar.bz2
+rm -rf org.eclipse.mylyn.commons.tar.bz2
diff --git a/sources b/sources
index 08f807d..4680dc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-262083f1581c6ab5f62aa79e913c9b31  eclipse-mylyn-R_3_5_1-fetched-src.tar.bz2
+2794c992b47788ef099db237d3b20008  eclipse-mylyn-R_3_6_0-fetched-src.tar.bz2
