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

jerboaa jerboaa at fedoraproject.org
Thu Jul 14 15:08:41 UTC 2011


commit 225f6b9d635072b9ca2a025b02a569780c14f2cc
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Thu Jul 14 11:06:28 2011 -0400

    - Update to upstream's 3.6.0 release.

 .gitignore                 |    1 +
 eclipse-mylyn-ide.spec     |   37 ++++++++++++++++++---------------
 fetch-eclipse-mylyn-ide.sh |   48 ++++++++++++++++++++++---------------------
 sources                    |    2 +-
 4 files changed, 47 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95940bf..85335e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 eclipse-mylyn-ide-R_3_5_0-fetched-src.tar.bz2
 eclipse-mylyn-ide-R_3_5_1-fetched-src.tar.bz2
+eclipse-mylyn-ide-R_3_6_0-fetched-src.tar.bz2
diff --git a/eclipse-mylyn-ide.spec b/eclipse-mylyn-ide.spec
index 3eec737..e489324 100644
--- a/eclipse-mylyn-ide.spec
+++ b/eclipse-mylyn-ide.spec
@@ -1,33 +1,33 @@
 %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.5.1/v20110422-0200/
-%global qualifier           v20110422-0200
+#  http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/
+%global qualifier           v20110608-1400
 
 Name: eclipse-mylyn-ide
 Summary: Mylyn Context Connector: Eclipse IDE
-Version: 3.5.1
+Version: 3.6.0
 Release: 1%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
 # bash fetch-eclipse-mylyn-ide.sh
-Source0: eclipse-mylyn-ide-R_3_5_1-fetched-src.tar.bz2
+Source0: eclipse-mylyn-ide-R_3_6_0-fetched-src.tar.bz2
 Source1: fetch-eclipse-mylyn-ide.sh
 
 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 >= 3.5.0
-BuildRequires: eclipse-mylyn-context >= 3.5.0
-BuildRequires: eclipse-mylyn-context-team >= 3.5.0
-
-Requires: eclipse-platform >= 1:3.4.0
-Requires: eclipse-mylyn >= 3.5.0
-Requires: eclipse-mylyn-context >= 3.5.0
-Requires: eclipse-mylyn-context-team >= 3.5.0
+BuildRequires: eclipse-platform >= 1:3.5.0
+BuildRequires: eclipse-pde >= 1:3.5.0
+BuildRequires: eclipse-mylyn >= 3.6.0
+BuildRequires: eclipse-mylyn-context >= 3.6.0
+BuildRequires: eclipse-mylyn-context-team >= 3.6.0
+
+Requires: eclipse-platform >= 1:3.5.0
+Requires: eclipse-mylyn >= 3.6.0
+Requires: eclipse-mylyn-context >= 3.6.0
+Requires: eclipse-mylyn-context-team >= 3.6.0
 Obsoletes: eclipse-mylyn-ide < %{version}-%{release}
 
 Group: Development/Tools
@@ -37,7 +37,7 @@ Mylyn Task-Focused UI extensions for the Eclipse IDE.
 Provides focusing of common IDE views and editors.
 
 %prep
-%setup -q -c
+%setup -q -n eclipse-mylyn-ide-R_3_6_0-fetched-src
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.ide_feature \
@@ -54,10 +54,13 @@ unzip -q -o -d %{buildroot}%{install_loc}/mylyn-ide \
 %files
 %defattr(-,root,root,-)
 %{install_loc}/mylyn-ide
-%doc org.eclipse.mylyn.contexts/org.eclipse.mylyn.ide-feature/epl-v10.html
-%doc org.eclipse.mylyn.contexts/org.eclipse.mylyn.ide-feature/license.html
+%doc org.eclipse.mylyn.ide-feature/epl-v10.html
+%doc org.eclipse.mylyn.ide-feature/license.html
 
 %changelog
+* Thu Jul 14 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-ide.sh b/fetch-eclipse-mylyn-ide.sh
index 8a48cb0..0a97a49 100644
--- a/fetch-eclipse-mylyn-ide.sh
+++ b/fetch-eclipse-mylyn-ide.sh
@@ -4,7 +4,7 @@
 # the org.eclipse.mylyn.ide-feature
 # 
 # eclipse-mylyn-context needs to be built prior to this.
-RELEASE_TAG="R_3_5_1"
+RELEASE_TAG="R_3_6_0"
 
 # get org.eclipse.mylyn.ide-feature sources
 # feature deps 
@@ -12,29 +12,31 @@ RELEASE_TAG="R_3_5_1"
 # - org.eclipse.mylyn.team_feature
 # provided by: eclipse-mylyn-context
 
-rm -fr org.eclipse.mylyn
-# get sources from org.eclipse.mylyn repo
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/mylyn \
-export -r ${RELEASE_TAG} org.eclipse.mylyn/org.eclipse.mylyn.help.ui;
+rm -rf org.eclipse.mylyn.tar.bz2
+rm -rf org.eclipse.mylyn.tasks.tar.bz2
+rm -rf org.eclipse.mylyn.commons.tar.bz2
 
-rm -fr org.eclipse.mylyn.tasks
-# get sources from org.eclipse.mylyn.tasks repo
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/mylyn \
-export -r ${RELEASE_TAG} org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.bugs;
+wget -O org.eclipse.mylyn.tar.bz2 http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.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.contexts
-# get sources from org.eclipse.mylyn.contexts repo
-for f in org.eclipse.mylyn.team.cvs \
-org.eclipse.mylyn.bugzilla.ide \
-org.eclipse.mylyn.ide-feature \
-org.eclipse.mylyn.team.cvs \
-org.eclipse.mylyn.ide.ui; do
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/mylyn \
-export -r ${RELEASE_TAG} org.eclipse.mylyn.contexts/$f;
+for i in org.eclipse.mylyn.tasks.tar.bz2 \
+         org.eclipse.mylyn.context.tar.bz2 \
+         org.eclipse.mylyn.tar.bz2; do
+  tar -xjf $i
 done
 
-rm -f eclipse-mylyn-ide-${RELEASE_TAG}-fetched-src.tar.bz2
-tar cjf eclipse-mylyn-ide-${RELEASE_TAG}-fetched-src.tar.bz2 \
-	org.eclipse.mylyn \
-	org.eclipse.mylyn.contexts \
-	org.eclipse.mylyn.tasks
+# remove sources we don't need
+pushd $RELEASE_TAG > /dev/null
+ls -1 | grep -vE 'org.eclipse.mylyn.help.ui|org.eclipse.mylyn.tasks.bugs|org.eclipse.mylyn.team.cvs|org.eclipse.mylyn.bugzilla.ide$|org.eclipse.mylyn.ide-feature|org.eclipse.mylyn.ide.ui' | xargs rm -rf
+popd > /dev/null
+
+FETCHED_SOURCES_NAME="eclipse-mylyn-ide-${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.tar.bz2
diff --git a/sources b/sources
index 53aa142..3b8a0da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96a65ecc5ca48f9f159868f4a5ff35a5  eclipse-mylyn-ide-R_3_5_1-fetched-src.tar.bz2
+bad3dcecd09322488cfa5f88ade9ae13  eclipse-mylyn-ide-R_3_6_0-fetched-src.tar.bz2


More information about the scm-commits mailing list