rpms/eclipse-mylyn/devel eclipse-mylyn-nosoap.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 eclipse-mylyn-splitxmlrpc.patch, 1.2, 1.3 eclipse-mylyn.spec, 1.54, 1.55 fetch-mylyn.sh, 1.14, 1.15 sources, 1.17, 1.18
Charley Wang
chwang at fedoraproject.org
Wed Jul 14 18:15:19 UTC 2010
Author: chwang
Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20615
Modified Files:
.cvsignore eclipse-mylyn-splitxmlrpc.patch eclipse-mylyn.spec
fetch-mylyn.sh sources
Added Files:
eclipse-mylyn-nosoap.patch
Log Message:
* Wed Jul 14 2010 Charley Wang <chwang at redhat.com> 3.4.0-1
- Update to 3.4.0. Add mylyn-commons feature, remove commons.soap
eclipse-mylyn-nosoap.patch:
feature.xml | 52 ----------------------------------------------------
1 file changed, 52 deletions(-)
--- NEW FILE eclipse-mylyn-nosoap.patch ---
--- org.eclipse.mylyn.commons-feature/feature.xml 2010-07-13 15:49:19.000000000 -0400
+++ org.eclipse.mylyn.commons-feature/feature.xml.nosoap 2010-07-13 15:58:30.000000000 -0400
@@ -47,13 +47,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.mylyn.commons.soap"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.mylyn.commons.ui"
download-size="0"
install-size="0"
@@ -89,37 +82,6 @@
unpack="false"/>
<plugin
- id="org.apache.axis"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="javax.wsdl"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.xml.rpc"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="javax.xml.soap"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.apache.commons.discovery"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.apache.commons.logging"
download-size="0"
install-size="0"
@@ -127,20 +89,6 @@
unpack="false"/>
<plugin
- id="javax.activation"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="javax.mail"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.apache.commons.codec"
download-size="0"
install-size="0"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore 25 Feb 2010 10:00:55 -0000 1.13
+++ .cvsignore 14 Jul 2010 18:15:17 -0000 1.14
@@ -1,6 +1 @@
-fedoraeclipse-mylynbugzilla-0.0.3.zip
-org.eclipse.mylyn-R_3_1_1-fetched-src.tar.bz2
-org.eclipse.mylyn-R_3_2_1-fetched-src.tar.bz2
-org.eclipse.mylyn-R_3_3_0-fetched-src.tar.bz2
-org.eclipse.mylyn-R_3_3_1-fetched-src.tar.bz2
-org.eclipse.mylyn-R_3_3_2-fetched-src.tar.bz2
+org.eclipse.mylyn-R_3_4_0-fetched-src.tar.bz2
eclipse-mylyn-splitxmlrpc.patch:
MANIFEST.MF | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Index: eclipse-mylyn-splitxmlrpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-splitxmlrpc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eclipse-mylyn-splitxmlrpc.patch 31 Oct 2008 15:15:06 -0000 1.2
+++ eclipse-mylyn-splitxmlrpc.patch 14 Jul 2010 18:15:17 -0000 1.3
@@ -1,13 +1,12 @@
-diff -up ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF.splitxmlrpc ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF
---- ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF.splitxmlrpc 2008-07-29 15:09:19.000000000 -0400
-+++ ./org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF 2008-07-29 15:42:17.000000000 -0400
-@@ -8,8 +8,11 @@ Require-Bundle: org.eclipse.core.runtime
- org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
+--- org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF.splitxmlrpc 2010-04-18 02:20:44.000000000 -0400
++++ org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF 2010-07-09 15:57:21.000000000 -0400
+@@ -9,8 +9,11 @@
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)",
+ org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
+- org.eclipse.mylyn.commons.xmlrpc;bundle-version="[3.0.0,4.0.0)",
- org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
-+ org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)"
++ org.eclipse.mylyn.commons.xmlrpc;bundle-version="[3.0.0,4.0.0)"
+Import-Package: org.apache.xmlrpc.client,
+ org.apache.xmlrpc,
+ org.apache.xmlrpc.common,
Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- eclipse-mylyn.spec 3 Mar 2010 13:19:40 -0000 1.54
+++ eclipse-mylyn.spec 14 Jul 2010 18:15:18 -0000 1.55
@@ -2,7 +2,7 @@
%define install_loc %{_datadir}/eclipse/dropins
# Taken from update site so we match upstream
# http://download.eclipse.org/tools/mylyn/update/e3.5/
-%define qualifier v20100222-0100-e3x
+%define qualifier v20100608-0100-e3x
# Prevent brp-java-repack-jars from being run. Spaces in the paths of
# the help content are broken by it.
@@ -10,14 +10,14 @@
Name: eclipse-mylyn
Summary: Mylyn is a task-focused UI for Eclipse
-Version: 3.3.2
-Release: 4%{?dist}
+Version: 3.4.0
+Release: 1%{?dist}
License: EPL and ASL 2.0
URL: http://www.eclipse.org/mylyn
# mkdir temp && cd temp
# sh fetch-mylyn.sh
-Source0: org.eclipse.mylyn-R_3_3_2-fetched-src.tar.bz2
+Source0: org.eclipse.mylyn-R_3_4_0-fetched-src.tar.bz2
Source1: fetch-mylyn.sh
# This is a dependency declared by the Orbit xmlrpc JAR. We don't use
@@ -29,6 +29,7 @@ Patch0: %{name}-nojaxb.patch
# This patch is not suitable for upstream.
Patch1: %{name}-splitxmlrpc.patch
Patch2: %{name}-wikitext_builddoc.patch
+Patch3: %{name}-nosoap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -135,7 +136,7 @@ element views and editors.
%prep
%setup -q -n org.eclipse.mylyn
-# The tests have dependencies we don't need/want/have
+# The tests and sdk have dependencies we don't need/want/have
rm -rf *tests*
mkdir orbitDeps
@@ -163,7 +164,8 @@ popd
%patch0
%patch1
-%patch2
+#%patch2
+%patch3
sed -i 's|bundle-version="2.3.0"|bundle-version="[2.3.0,3.0.0)"|g' org.eclipse.mylyn.commons.net/META-INF/MANIFEST.MF
@@ -173,6 +175,10 @@ find -name feature.xml |
done
%build
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.commons \
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn_feature \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
@@ -229,6 +235,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{insta
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-wikitext
unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \
+ build/rpmBuild/org.eclipse.mylyn.commons.zip
+unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \
build/rpmBuild/org.eclipse.mylyn_feature.zip
unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \
build/rpmBuild/org.eclipse.mylyn.bugzilla_feature.zip
@@ -252,15 +260,17 @@ unzip -q -o -d $RPM_BUILD_ROOT%{install_
build/rpmBuild/org.eclipse.cdt.mylyn.zip
pushd $RPM_BUILD_ROOT%{install_loc}/mylyn/eclipse/plugins
+ls
rm org.apache.commons.codec_*.jar
rm org.apache.commons.httpclient_3.1.0.v20080605-1935.jar
-rm org.apache.commons.lang_2.4.0.v200803190541.jar
-rm org.apache.commons.logging_1.0.4.v20080605-1930.jar
+rm org.apache.commons.lang_*.jar
+rm org.apache.commons.logging_*.jar
ln -s %{_javadir}/commons-lang.jar org.apache.commons.lang_2.4.0.jar
ln -s %{_javadir}/commons-logging-api.jar org.apache.commons.logging.api_1.0.4.jar
popd
pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-trac/eclipse/plugins
+ls
rm org.apache.ws.commons.util_1.0.0.%{qualifier}.jar
rm org.apache.xmlrpc_3.0.0.%{qualifier}.jar
ln -s %{_javadir}/xmlrpc3-client-3.0.jar org.apache.xmlrpc.client_3.0.0.v20080530-1550.jar
@@ -331,6 +341,9 @@ rm -rf %{buildroot}
# FIXME: add the doc files back
%changelog
+* Wed Jul 14 2010 Charley Wang <chwang at redhat.com> 3.4.0-1
+- Update to 3.4.0. Add mylyn-commons feature, remove commons.soap
+
* Wed Mar 3 2010 Alexander Kurtakov <akurtako at redhat.com> 3.3.2-4
- Relax bundle version requires for commons-lang.
Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- fetch-mylyn.sh 25 Feb 2010 09:58:41 -0000 1.14
+++ fetch-mylyn.sh 14 Jul 2010 18:15:18 -0000 1.15
@@ -4,25 +4,27 @@ rm -fr org.eclipse.mylyn
for f in \
org.eclipse.mylyn \
+org.eclipse.mylyn-feature \
org.eclipse.mylyn.bugzilla.core \
org.eclipse.mylyn.bugzilla-feature \
org.eclipse.mylyn.bugzilla.ide \
org.eclipse.mylyn.bugzilla.tests \
org.eclipse.mylyn.bugzilla.ui \
org.eclipse.mylyn.commons.core \
+org.eclipse.mylyn.commons-feature \
org.eclipse.mylyn.commons.net \
org.eclipse.mylyn.commons.ui \
-org.eclipse.mylyn.compatibility \
+org.eclipse.mylyn.commons.xmlrpc \
org.eclipse.mylyn.context.core \
org.eclipse.mylyn.context-feature \
org.eclipse.mylyn.context.tests \
org.eclipse.mylyn.context.ui \
org.eclipse.mylyn.discovery.core \
+org.eclipse.mylyn.discovery.tests \
org.eclipse.mylyn.discovery.ui \
org.eclipse.mylyn-feature \
org.eclipse.mylyn.help.ui \
org.eclipse.mylyn.ide.ant \
-org.eclipse.mylyn.ide.dev \
org.eclipse.mylyn.ide-feature \
org.eclipse.mylyn.ide.tests \
org.eclipse.mylyn.ide.ui \
@@ -33,6 +35,7 @@ org.eclipse.mylyn.java.ui \
org.eclipse.mylyn.monitor.core \
org.eclipse.mylyn.monitor-feature \
org.eclipse.mylyn.monitor.tests \
+org.eclipse.mylyn.monitor.reports \
org.eclipse.mylyn.monitor.ui \
org.eclipse.mylyn.monitor.usage \
org.eclipse.mylyn.pde-feature \
@@ -41,6 +44,7 @@ org.eclipse.mylyn.resources.tests \
org.eclipse.mylyn.resources.ui \
org.eclipse.mylyn.tasks.bugs \
org.eclipse.mylyn.tasks.core \
+org.eclipse.mylyn.tasks.search \
org.eclipse.mylyn.tasks.tests \
org.eclipse.mylyn.tasks.ui \
org.eclipse.mylyn.team.cvs \
@@ -48,10 +52,12 @@ org.eclipse.mylyn.team-feature \
org.eclipse.mylyn.team.tests \
org.eclipse.mylyn.team.ui \
org.eclipse.mylyn.tests \
+org.eclipse.mylyn.tests.util \
org.eclipse.mylyn.trac.core \
org.eclipse.mylyn.trac-feature \
org.eclipse.mylyn.trac.tests \
org.eclipse.mylyn.trac.ui \
+org.eclipse.mylyn.trac.wiki \
org.eclipse.mylyn.web.tasks-feature \
org.eclipse.mylyn.web.tasks \
org.eclipse.mylyn.wikitext-feature \
@@ -74,7 +80,10 @@ org.eclipse.mylyn.cdt-feature \
org.eclipse.mylyn.cdt.ui \
; do
cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools \
-export -r R_3_3_2_e_3_5 org.eclipse.mylyn/$f;
+export -r R_3_4_0 org.eclipse.mylyn/$f;
done
-tar cjf org.eclipse.mylyn-R_3_3_2-fetched-src.tar.bz2 org.eclipse.mylyn
+tar cjf org.eclipse.mylyn-R_3_4_0-fetched-src.tar.bz2 org.eclipse.mylyn
+
+rm -rf org.eclipse.mylyn.bak
+cp -r org.eclipse.mylyn org.eclipse.mylyn.bak
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources 25 Feb 2010 09:58:41 -0000 1.17
+++ sources 14 Jul 2010 18:15:18 -0000 1.18
@@ -1 +1 @@
-2f56d6de0d81350a6f606dfbb8c2bf00 org.eclipse.mylyn-R_3_3_2-fetched-src.tar.bz2
+ee532947cc4839c60a34aa65372ba310 org.eclipse.mylyn-R_3_4_0-fetched-src.tar.bz2
More information about the scm-commits
mailing list