[eclipse-mylyn-tasks/f17] Update to upstream 3.7.0 release.
Krzysztof Daniel
kdaniel at fedoraproject.org
Tue Mar 27 09:21:05 UTC 2012
commit b953430bb07d6500232f9f1dab03e7c88f72686a
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Tue Mar 27 11:20:00 2012 +0200
Update to upstream 3.7.0 release.
.gitignore | 4 +
...c-core-xmlrpc-import-package-manifest-fix.patch | 21 +++----
eclipse-mylyn-tasks.spec | 66 +++++++++++--------
fetch-eclipse-mylyn-tasks.sh | 13 +++-
sources | 2 +-
5 files changed, 63 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1d7fe97..6613492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@ eclipse-mylyn-tasks-R_3_6_0-fetched-src.tar.bz2
eclipse-mylyn-tasks-R_3_6_2-fetched-src.tar.bz2
eclipse-mylyn-tasks-R_3_6_3-fetched-src.tar.bz2
eclipse-mylyn-tasks-R_3_6_4-fetched-src.tar.bz2
+/eclipse-mylyn-tasks-R_3_7_0-fetched-src.tar.bz2
+/eclipse-mylyn-tasks-3.7.0
+/noarch
+/.project
diff --git a/eclipse-mylyn-tasks-trac-core-xmlrpc-import-package-manifest-fix.patch b/eclipse-mylyn-tasks-trac-core-xmlrpc-import-package-manifest-fix.patch
index 0664c3a..8aa6a32 100644
--- a/eclipse-mylyn-tasks-trac-core-xmlrpc-import-package-manifest-fix.patch
+++ b/eclipse-mylyn-tasks-trac-core-xmlrpc-import-package-manifest-fix.patch
@@ -1,13 +1,6 @@
-### Eclipse Workspace Patch 1.0
-#P org.eclipse.mylyn.trac.core
-Index: META-INF/MANIFEST.MF
-===================================================================
-RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF,v
-retrieving revision 1.190
-diff -u -r1.190 MANIFEST.MF
---- org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF 26 Jun 2010 07:37:39 -0000 1.190
-+++ org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF 15 Apr 2011 20:37:21 -0000
-@@ -9,8 +9,7 @@
+--- org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF.bak 2012-03-16 10:42:08.000000000 +0100
++++ org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF 2012-03-27 10:44:46.399967601 +0200
+@@ -8,8 +8,7 @@
org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
@@ -17,11 +10,15 @@ diff -u -r1.190 MANIFEST.MF
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.mylyn.trac.ui",
org.eclipse.mylyn.internal.trac.core.client;x-friends:="org.eclipse.mylyn.trac.ui",
-@@ -19,3 +18,8 @@
+@@ -18,5 +17,10 @@
Bundle-Activator: org.eclipse.mylyn.internal.trac.core.TracCorePlugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Localization: plugin
-+Import-Package: org.apache.xmlrpc,
+-Import-Package: com.google.gson;version="1.6.0",
+- com.google.gson.reflect;version="1.6.0"
++Import-Package: com.google.gson,
++ com.google.gson.reflect,
++ org.apache.xmlrpc,
+ org.apache.xmlrpc.client,
+ org.apache.xmlrpc.serializer,
+ org.apache.xmlrpc.common,
diff --git a/eclipse-mylyn-tasks.spec b/eclipse-mylyn-tasks.spec
index 4ffd510..567ff11 100644
--- a/eclipse-mylyn-tasks.spec
+++ b/eclipse-mylyn-tasks.spec
@@ -6,8 +6,8 @@
Name: eclipse-mylyn-tasks
Summary: Mylyn Bugzilla/Trac Tasks Connectors
-Version: 3.6.4
-Release: 5%{?dist}
+Version: 3.7.0
+Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn/tasks
@@ -18,7 +18,7 @@ BuildArch: noarch
%endif
# bash fetch-eclipse-mylyn-tasks.sh
-Source0: eclipse-mylyn-tasks-R_3_6_4-fetched-src.tar.bz2
+Source0: eclipse-mylyn-tasks-R_3_7_0-fetched-src.tar.bz2
Source1: fetch-eclipse-mylyn-tasks.sh
# Red Hat bugzilla's custom transition file
Source2: redhat-bugzilla-custom-transitions.txt
@@ -30,11 +30,12 @@ Patch0: %{name}-bugzilla-core-xmlrpc-import-package-manifest-fix.patch
Patch1: %{name}-trac-core-xmlrpc-import-package-manifest-fix.patch
BuildRequires: java-devel >= 1.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
+BuildRequires: eclipse-platform >= 1:3.8.0
+BuildRequires: eclipse-pde >= 1:3.8.0
+BuildRequires: eclipse-mylyn >= 3.7.0
+BuildRequires: eclipse-mylyn-commons >= 3.7.0
+BuildRequires: eclipse-mylyn-context >= 3.7.0
+BuildRequires: google-gson = 1.7.1
# The following two are required for webtasks
BuildRequires: rome
BuildRequires: jdom
@@ -47,9 +48,9 @@ Mylyn Tasks Connectors
%package bugzilla
Summary: Mylyn Tasks Connector: Bugzilla
-Requires: eclipse-platform >= 1:3.5.0
-Requires: eclipse-mylyn >= 3.6.0
-Requires: eclipse-mylyn-commons >= 3.6.0
+Requires: eclipse-platform >= 1:3.8.0
+Requires: eclipse-mylyn >= 3.7.0
+Requires: eclipse-mylyn-commons >= 3.7.0
Provides: eclipse-mylyn-bugzilla = %{version}-%{release}
Obsoletes: eclipse-mylyn-bugzilla < %{version}-%{release}
Group: Development/Tools
@@ -63,10 +64,11 @@ open source Bugzilla bug tracker.
%package trac
Summary: Mylyn Tasks Connector: Trac
-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
+Requires: eclipse-platform >= 1:3.8.0
+Requires: eclipse-mylyn >= 3.7.0
+Requires: eclipse-mylyn-commons >= 3.7.0
+Requires: eclipse-mylyn-context >= 3.7.0
+Requires: google-gson
Group: Development/Tools
Provides: eclipse-mylyn-trac = %{version}-%{release}
Obsoletes: eclipse-mylyn-trac < %{version}-%{release}
@@ -80,9 +82,9 @@ for the open source Trac issue tracker.
%package web
Summary: Mylyn Tasks Connector: Web Templates (Advanced) (Incubation)
-Requires: eclipse-platform >= 1:3.5.0
-Requires: eclipse-mylyn >= 3.6.0
-Requires: eclipse-mylyn-commons >= 3.6.0
+Requires: eclipse-platform >= 1:3.8.0
+Requires: eclipse-mylyn >= 3.7.0
+Requires: eclipse-mylyn-commons >= 3.7.0
Requires: rome
Requires: jdom
Group: Development/Tools
@@ -96,7 +98,7 @@ and templates for example projects.
%prep
%setup -q -c
-pushd eclipse-mylyn-tasks-R_3_6_4-fetched-src
+pushd eclipse-mylyn-tasks-R_3_7_0-fetched-src
%patch0
%patch1
rm -rf orbitDeps
@@ -104,10 +106,11 @@ mkdir orbitDeps
pushd orbitDeps
ln -s %{_javadir}/rome-0.9.jar
ln -s %{_javadir}/jdom.jar
+ln -s %{_javadir}/google-gson.jar
popd
%build
-pushd eclipse-mylyn-tasks-R_3_6_4-fetched-src
+pushd eclipse-mylyn-tasks-R_3_7_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 \
@@ -115,7 +118,8 @@ pushd eclipse-mylyn-tasks-R_3_6_4-fetched-src
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.trac_feature \
-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"
+ -d "mylyn mylyn-commons mylyn-context" \
+ -o `pwd`/orbitDeps
%{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 \
@@ -129,7 +133,7 @@ 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 eclipse-mylyn-tasks-R_3_6_4-fetched-src
+pushd eclipse-mylyn-tasks-R_3_7_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 \
@@ -145,29 +149,35 @@ rm org.jdom*
# link to system files instead
ln -s %{_javadir}/rome-0.9.jar
ln -s %{_javadir}/jdom.jar
+
+ln -s %{_javadir}/google-gson.jar
+
popd
# eclips-mylyn-tasks-bugzilla
%files bugzilla
%{install_loc}/mylyn-bugzilla
-%doc eclipse-mylyn-tasks-R_3_6_4-fetched-src/org.eclipse.mylyn.bugzilla-feature/epl-v10.html
-%doc eclipse-mylyn-tasks-R_3_6_4-fetched-src/org.eclipse.mylyn.bugzilla-feature/license.html
+%doc eclipse-mylyn-tasks-R_3_7_0-fetched-src/org.eclipse.mylyn.bugzilla-feature/epl-v10.html
+%doc eclipse-mylyn-tasks-R_3_7_0-fetched-src/org.eclipse.mylyn.bugzilla-feature/license.html
# eclips-mylyn-tasks-trac
%files trac
%{install_loc}/mylyn-trac
-%doc eclipse-mylyn-tasks-R_3_6_4-fetched-src/org.eclipse.mylyn.trac-feature/epl-v10.html
-%doc eclipse-mylyn-tasks-R_3_6_4-fetched-src/org.eclipse.mylyn.trac-feature/license.html
+%doc eclipse-mylyn-tasks-R_3_7_0-fetched-src/org.eclipse.mylyn.trac-feature/epl-v10.html
+%doc eclipse-mylyn-tasks-R_3_7_0-fetched-src/org.eclipse.mylyn.trac-feature/license.html
# eclips-mylyn-tasks-web
%files web
%{install_loc}/mylyn-webtasks
-%doc eclipse-mylyn-tasks-R_3_6_4-fetched-src/org.eclipse.mylyn.web.tasks-feature/epl-v10.html
-%doc eclipse-mylyn-tasks-R_3_6_4-fetched-src/org.eclipse.mylyn.web.tasks-feature/license.html
+%doc eclipse-mylyn-tasks-R_3_7_0-fetched-src/org.eclipse.mylyn.web.tasks-feature/epl-v10.html
+%doc eclipse-mylyn-tasks-R_3_7_0-fetched-src/org.eclipse.mylyn.web.tasks-feature/license.html
%changelog
+* Tue Mar 27 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-1
+- Update to upstream 3.7.0 version.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/fetch-eclipse-mylyn-tasks.sh b/fetch-eclipse-mylyn-tasks.sh
index 6639658..a658144 100755
--- a/fetch-eclipse-mylyn-tasks.sh
+++ b/fetch-eclipse-mylyn-tasks.sh
@@ -5,26 +5,35 @@
# - org.eclipse.mylyn.bugzilla-feature
# - org.eclipse.mylyn.web.tasks-feature (incubation)
#
-RELEASE_TAG="R_3_6_4"
+RELEASE_TAG="R_3_7_0"
+INCUBATOR_RELEASE_TAG="R_3_6_5"
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
+wget -O org.eclipse.mylyn.incubator.tar.bz2 http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.incubator.git/snapshot/${INCUBATOR_RELEASE_TAG}.tar.bz2
for i in org.eclipse.mylyn.tasks.tar.bz2 \
org.eclipse.mylyn.incubator.tar.bz2; do
tar -xjf $i
done
+# mv ${INCUBATOR_RELEASE_TAG}/*
+
# 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.*' | xargs rm -rf
popd > /dev/null
+pushd $INCUBATOR_RELEASE_TAG > /dev/null
+ls -1 | grep -vE 'org.eclipse.mylyn.trac.*|org.eclipse.mylyn.bugzilla.*|org.eclipse.mylyn.web.*' | xargs rm -rf
+popd > /dev/null
+
FETCHED_SOURCES_NAME="eclipse-mylyn-tasks-${RELEASE_TAG}-fetched-src"
mv $RELEASE_TAG $FETCHED_SOURCES_NAME
+mv $INCUBATOR_RELEASE_TAG/* $FETCHED_SOURCES_NAME
+rm -rf $INCUBATOR_RELEASE_TAG
rm -rf $FETCHED_SOURCES_NAME.tar.bz2
tar -cjf $FETCHED_SOURCES_NAME.tar.bz2 $FETCHED_SOURCES_NAME
diff --git a/sources b/sources
index 07bdb49..15dda0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-79e760e7d096db6ef621ba42565c9ee0 eclipse-mylyn-tasks-R_3_6_4-fetched-src.tar.bz2
+5a97f121d32ff7dbe8b3a8bef2d2e613 eclipse-mylyn-tasks-R_3_7_0-fetched-src.tar.bz2
More information about the scm-commits
mailing list