[eclipse-mylyn-tasks] Update to upstream 3.6.0
Minoo Ziaei
mziaei1 at fedoraproject.org
Thu Jul 14 20:48:40 UTC 2011
commit 6f0441c739f64ac0b928d59680e3be8698c3fb76
Author: Minoo Ziaei <mziaei at redhat.com>
Date: Thu Jul 14 16:47:31 2011 -0400
Update to upstream 3.6.0
.gitignore | 2 +
eclipse-mylyn-tasks.spec | 74 ++++++++++++++++++++----------------------
fetch-eclipse-mylyn-tasks.sh | 47 ++++++++++++---------------
sources | 2 +-
4 files changed, 59 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d0acf5..ce85c31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
eclipse-mylyn-tasks-R_3_5_0-fetched-src.tar.bz2
eclipse-mylyn-tasks-R_3_5_1-fetched-src.tar.bz2
+eclipse-mylyn-R_3_6_0-fetched-src.tar.bz2
+eclipse-mylyn-tasks-R_3_6_0-fetched-src.tar.bz2
diff --git a/eclipse-mylyn-tasks.spec b/eclipse-mylyn-tasks.spec
index 851fab1..4b70f1e 100644
--- a/eclipse-mylyn-tasks.spec
+++ b/eclipse-mylyn-tasks.spec
@@ -1,18 +1,18 @@
%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-tasks
Summary: Mylyn Bugzilla/Trac Tasks Connectors
-Version: 3.5.1
-Release: 3%{?dist}
+Version: 3.6.0
+Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn/tasks
# bash fetch-eclipse-mylyn-tasks.sh
-Source0: eclipse-mylyn-tasks-R_3_5_1-fetched-src.tar.bz2
+Source0: eclipse-mylyn-tasks-R_3_6_0-fetched-src.tar.bz2
Source1: fetch-eclipse-mylyn-tasks.sh
# Red Hat bugzilla's custom transition file
Source2: redhat-bugzilla-custom-transitions.txt
@@ -26,11 +26,11 @@ Patch1: %{name}-trac-core-xmlrpc-import-package-manifest-fix.patch
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-commons >= 3.5.0
-BuildRequires: eclipse-mylyn-context >= 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-commons >= 3.6.0
+BuildRequires: eclipse-mylyn-context >= 3.6.0
# The following two are required for webtasks
BuildRequires: rome
BuildRequires: jdom
@@ -43,9 +43,9 @@ Mylyn Tasks Connectors
%package bugzilla
Summary: Mylyn Tasks Connector: Bugzilla
-Requires: eclipse-platform >= 1:3.4.0
-Requires: eclipse-mylyn >= 3.5.0
-Requires: eclipse-mylyn-commons >= 3.5.0
+Requires: eclipse-platform >= 1:3.5.0
+Requires: eclipse-mylyn >= 3.6.0
+Requires: eclipse-mylyn-commons >= 3.6.0
Provides: eclipse-mylyn-bugzilla = %{version}-%{release}
Obsoletes: eclipse-mylyn-bugzilla < %{version}-%{release}
Group: Development/Tools
@@ -59,10 +59,10 @@ open source Bugzilla bug tracker.
%package trac
Summary: Mylyn Tasks Connector: Trac
-Requires: eclipse-platform >= 1:3.4.0
-Requires: eclipse-mylyn >= 3.5.0
-Requires: eclipse-mylyn-commons >= 3.5.0
-Requires: eclipse-mylyn-context >= 3.5.0
+Requires: eclipse-platform >= 1:3.5.0
+Requires: eclipse-mylyn >= 3.6.0
+Requires: eclipse-mylyn-commons >= 3.6.0
+Requires: eclipse-mylyn-context >= 3.6.0
Group: Development/Tools
Provides: eclipse-mylyn-trac = %{version}-%{release}
Obsoletes: eclipse-mylyn-trac < %{version}-%{release}
@@ -76,9 +76,9 @@ for the open source Trac issue tracker.
%package web
Summary: Mylyn Tasks Connector: Web Templates (Advanced) (Incubation)
-Requires: eclipse-platform >= 1:3.4.0
-Requires: eclipse-mylyn >= 3.5.0
-Requires: eclipse-mylyn-commons >= 3.5.0
+Requires: eclipse-platform >= 1:3.5.0
+Requires: eclipse-mylyn >= 3.6.0
+Requires: eclipse-mylyn-commons >= 3.6.0
Requires: rome
Requires: jdom
Group: Development/Tools
@@ -92,22 +92,20 @@ and templates for example projects.
%prep
%setup -q -c
-pushd org.eclipse.mylyn.tasks
+pushd eclipse-mylyn-tasks-R_3_6_0-fetched-src
%patch0
%patch1
-popd
-pushd org.eclipse.mylyn.incubator
+#popd
+#pushd org.eclipse.mylyn.incubator
rm -rf orbitDeps
mkdir orbitDeps
pushd orbitDeps
ln -s %{_javadir}/rome-0.9.jar
ln -s %{_javadir}/jdom.jar
popd
-popd
-
%build
-pushd org.eclipse.mylyn.tasks
+pushd eclipse-mylyn-tasks-R_3_6_0-fetched-src
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.bugzilla_feature \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
@@ -116,8 +114,6 @@ pushd org.eclipse.mylyn.tasks
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
-d "mylyn mylyn-commons mylyn-context"
-popd
-pushd org.eclipse.mylyn.incubator
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.web.tasks_feature \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
@@ -131,17 +127,14 @@ install -d -m 755 %{buildroot}%{install_loc}/mylyn-trac
install -d -m 755 %{buildroot}%{install_loc}/mylyn-webtasks
install %{SOURCE2} %{buildroot}%{install_loc}/mylyn-bugzilla/redhat-bugzilla-custom-transitions.txt
-pushd org.eclipse.mylyn.tasks
+pushd eclipse-mylyn-tasks-R_3_6_0-fetched-src
unzip -q -o -d %{buildroot}%{install_loc}/mylyn-bugzilla \
build/rpmBuild/org.eclipse.mylyn.bugzilla_feature.zip
unzip -q -o -d %{buildroot}%{install_loc}/mylyn-trac \
build/rpmBuild/org.eclipse.mylyn.trac_feature.zip
-popd
-pushd org.eclipse.mylyn.incubator
+
unzip -q -o -d %{buildroot}%{install_loc}/mylyn-webtasks \
build/rpmBuild/org.eclipse.mylyn.web.tasks_feature.zip
-popd
-pushd %{buildroot}%{install_loc}/mylyn-webtasks/eclipse/plugins
# rome
rm -rf com.sun.syndication*
# jdom
@@ -157,8 +150,8 @@ popd
%files bugzilla
%defattr(-,root,root,-)
%{install_loc}/mylyn-bugzilla
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla-feature/epl-v10.html
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla-feature/license.html
+%doc eclipse-mylyn-tasks-R_3_6_0-fetched-src/org.eclipse.mylyn.bugzilla-feature/epl-v10.html
+%doc eclipse-mylyn-tasks-R_3_6_0-fetched-src/org.eclipse.mylyn.bugzilla-feature/license.html
# eclips-mylyn-tasks-trac
@@ -166,8 +159,8 @@ popd
%files trac
%defattr(-,root,root,-)
%{install_loc}/mylyn-trac
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/epl-v10.html
-%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac-feature/license.html
+%doc eclipse-mylyn-tasks-R_3_6_0-fetched-src/org.eclipse.mylyn.trac-feature/epl-v10.html
+%doc eclipse-mylyn-tasks-R_3_6_0-fetched-src/org.eclipse.mylyn.trac-feature/license.html
# eclips-mylyn-tasks-web
@@ -175,11 +168,14 @@ popd
%files web
%defattr(-,root,root,-)
%{install_loc}/mylyn-webtasks
-%doc org.eclipse.mylyn.incubator/org.eclipse.mylyn.web.tasks-feature/epl-v10.html
-%doc org.eclipse.mylyn.incubator/org.eclipse.mylyn.web.tasks-feature/license.html
+%doc eclipse-mylyn-tasks-R_3_6_0-fetched-src/org.eclipse.mylyn.web.tasks-feature/epl-v10.html
+%doc eclipse-mylyn-tasks-R_3_6_0-fetched-src/org.eclipse.mylyn.web.tasks-feature/license.html
%changelog
+* Thu Jul 14 2011 Minoo Ziaei <mziaei at redhat.com> 3.6.0-1
+- Update to upstream 3.6.0.
+
* Tue May 10 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.5.1-3
- Updated redhat-bugzilla-custom-transitions.txt which solves
Eclipse BZ 343563 (closed bugs not as such indicated in UI).
diff --git a/fetch-eclipse-mylyn-tasks.sh b/fetch-eclipse-mylyn-tasks.sh
index 73f6c62..4f9f831 100644
--- a/fetch-eclipse-mylyn-tasks.sh
+++ b/fetch-eclipse-mylyn-tasks.sh
@@ -5,35 +5,30 @@
# - org.eclipse.mylyn.bugzilla-feature
# - org.eclipse.mylyn.web.tasks-feature (incubation)
#
-RELEASE_TAG="R_3_5_1"
+RELEASE_TAG="R_3_6_0"
-# FIXME: Remove this tag variable and use the same as RELEASE_TAG once it has
-# been tagged upstream. However, since there have been no changes from 3.5.0
-# this should be ok for now. See Eclipse BZ #343426.
-WEBTASK_RELEASE_TAG="R_3_5_0"
+rm -rf org.eclipse.mylyn.tasks.tar.bz2
+rm -rf org.eclipse.mylyn.incubator.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
+wget -O org.eclipse.mylyn.incubator.tar.bz2 http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.incubator.git/snapshot/${RELEASE_TAG}.tar.bz2
-rm -fr org.eclipse.mylyn.tasks
-for f in \
-org.eclipse.mylyn.bugzilla-feature \
-org.eclipse.mylyn.bugzilla.core \
-org.eclipse.mylyn.bugzilla.ui \
-org.eclipse.mylyn.trac.core \
-org.eclipse.mylyn.trac-feature \
-org.eclipse.mylyn.trac.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.incubator.tar.bz2; do
+ tar -xjf $i
done
-rm -fr org.eclipse.mylyn.incubator
-for f in \
-org.eclipse.mylyn.web.tasks-feature \
-org.eclipse.mylyn.web.tasks; do
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/mylyn \
-export -r ${WEBTASK_RELEASE_TAG} org.eclipse.mylyn.incubator/$f;
-done
+# remove sources we don't need
+pushd $RELEASE_TAG > /dev/null
+ls -1 | grep -vE 'org.eclipse.mylyn.trac.*|org.eclipse.mylyn.bugzilla.*|org.eclipse.mylyn.web.*|org.eclipse.mylyn.tasks.*' | xargs rm -rf
+popd > /dev/null
+
+FETCHED_SOURCES_NAME="eclipse-mylyn-tasks-${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 -f eclipse-mylyn-tasks-${RELEASE_TAG}-fetched-src.tar.bz2
-tar cjf eclipse-mylyn-tasks-${RELEASE_TAG}-fetched-src.tar.bz2 \
- org.eclipse.mylyn.tasks \
- org.eclipse.mylyn.incubator
+rm -rf $FETCHED_SOURCES_NAME
+rm -rf org.eclipse.mylyn.tasks.tar.bz2
+rm -rf org.eclipse.mylyn.incubator.tar.bz2
diff --git a/sources b/sources
index f0f54b0..229a2a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb0864a949a3fb46968381c16660eb08 eclipse-mylyn-tasks-R_3_5_1-fetched-src.tar.bz2
+8add4a965827315316c0e45bb6def700 eclipse-mylyn-tasks-R_3_6_0-fetched-src.tar.bz2
More information about the scm-commits
mailing list