rpms/eclipse-mylyn/devel eclipse-mylyn-clean-sdk.patch, NONE, 1.1 eclipse-mylyn-splitxmlrpc.patch, 1.4, 1.5 eclipse-mylyn-wikitext_builddoc.patch, 1.4, 1.5 eclipse-mylyn.spec, 1.58, 1.59 fetch-mylyn.sh, 1.15, 1.16 sources, 1.18, 1.19
Charley Wang
chwang at fedoraproject.org
Tue Jul 27 22:12:51 UTC 2010
Author: chwang
Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21142
Modified Files:
eclipse-mylyn-splitxmlrpc.patch
eclipse-mylyn-wikitext_builddoc.patch eclipse-mylyn.spec
fetch-mylyn.sh sources
Added Files:
eclipse-mylyn-clean-sdk.patch
Log Message:
* Tue Jul 27 2010 Charley Wang <chwang at redhat.com> 3.4.0-4
- Add Wikitext SDK to eclipse-mylyn
eclipse-mylyn-clean-sdk.patch:
feature.xml | 49 -------------------------------------------------
1 file changed, 49 deletions(-)
--- NEW FILE eclipse-mylyn-clean-sdk.patch ---
--- org.eclipse.mylyn.sdk-feature/feature.xml 2010-05-26 14:49:25.000000000 -0400
+++ org.eclipse.mylyn.sdk-feature/feature.xml.removeunneeded 2010-07-27 10:26:22.311165476 -0400
@@ -127,13 +127,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.mylyn.commons.soap.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.mylyn.commons.xmlrpc.source"
download-size="0"
install-size="0"
@@ -246,34 +239,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.mylyn.oslc.core.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.oslc.ui.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.oslc.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.oslc.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.jdom"
download-size="0"
install-size="0"
@@ -281,20 +246,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.mylyn.ide.capabilities.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.mylyn.commons.soap.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.mylyn.trac.ui.source"
download-size="0"
install-size="0"
eclipse-mylyn-splitxmlrpc.patch:
org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF | 1 +
org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF | 1 +
org.eclipse.mylyn.trac.core/META-INF/MANIFEST.MF | 1 +
3 files changed, 3 insertions(+)
Index: eclipse-mylyn-splitxmlrpc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-splitxmlrpc.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eclipse-mylyn-splitxmlrpc.patch 21 Jul 2010 20:43:33 -0000 1.4
+++ eclipse-mylyn-splitxmlrpc.patch 27 Jul 2010 22:12:49 -0000 1.5
@@ -8,3 +8,23 @@
org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.mylyn.trac.ui",
+--- org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF 2010-04-21 17:10:24.000000000 -0400
++++ org.eclipse.mylyn.bugzilla.core/META-INF/MANIFEST.MF.splitxmlrpc 2010-07-27 09:39:24.318149682 -0400
+@@ -10,6 +10,7 @@
+ org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.net,
+ org.eclipse.mylyn.commons.xmlrpc;bundle-version="[3.4.0,4.0.0)",
++ org.apache.xmlrpc.common,
+ org.apache.xmlrpc
+ Bundle-ActivationPolicy: lazy
+ Bundle-Vendor: %Bundle-Vendor
+--- org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF 2010-04-18 02:20:43.000000000 -0400
++++ org.eclipse.mylyn.commons.xmlrpc/META-INF/MANIFEST.MF.splitxmlrpc 2010-07-27 09:41:40.183163071 -0400
+@@ -7,6 +7,7 @@
+ Require-Bundle: org.eclipse.core.runtime,
+ 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.apache.xmlrpc.common;bundle-version="[3.0.0,4.0.0)",
+ org.apache.xmlrpc;bundle-version="[3.0.0,4.0.0)"
+ Bundle-ActivationPolicy: lazy
+ Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
eclipse-mylyn-wikitext_builddoc.patch:
MANIFEST.MF | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: eclipse-mylyn-wikitext_builddoc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-wikitext_builddoc.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eclipse-mylyn-wikitext_builddoc.patch 25 Feb 2010 10:37:41 -0000 1.4
+++ eclipse-mylyn-wikitext_builddoc.patch 27 Jul 2010 22:12:49 -0000 1.5
@@ -2,7 +2,7 @@
+++ org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF 2009-10-26 14:00:23.969824099 +0200
@@ -4,5 +4,7 @@ Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.mylyn.wikitext.help.ui;singleton:=true
- Bundle-Version: 1.2.1.qualifier
+ Bundle-Version: 1.3.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.eclipse.help
+Require-Bundle: org.eclipse.help,
Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- eclipse-mylyn.spec 21 Jul 2010 20:43:33 -0000 1.58
+++ eclipse-mylyn.spec 27 Jul 2010 22:12:49 -0000 1.59
@@ -11,7 +11,7 @@
Name: eclipse-mylyn
Summary: Mylyn is a task-focused UI for Eclipse
Version: 3.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: EPL and ASL 2.0
URL: http://www.eclipse.org/mylyn
@@ -31,6 +31,7 @@ Patch1: %{name}-splitxmlrpc.patch
Patch2: %{name}-wikitext_builddoc.patch
Patch3: %{name}-nosoap.patch
Patch4: %{name}-nocdtversion.patch
+Patch5: %{name}-clean-sdk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -120,7 +121,8 @@ Group: Development/Tools
%description wikitext
Enables parsing and display of lightweight markup (wiki text). Extends
-the Mylyn task editor to create a markup-aware editor.
+the Mylyn task editor to create a markup-aware editor. Includes WikiText
+SDK
%package cdt
Summary: Mylyn Bridge: C/C++ Development
@@ -134,11 +136,23 @@ Obsoletes: eclipse-cdt-mylyn <= 1:6.0.1-
Mylyn Task-Focused UI extensions for CDT. Provides focusing of C/C++
element views and editors.
+#%package sdk
+#Summary: Mylyn SDK
+#Requires: %{name} = %{version}-%{release}
+#Group: Development/Tools
+#
+#%description sdk
+#SDK for Mylyn project.
+
+
%prep
%setup -q -n org.eclipse.mylyn
# The tests and sdk have dependencies we don't need/want/have
+# Save the wikitext tests for now
+mv org.eclipse.mylyn.wikitext.tests backup
rm -rf *tests*
+mv backup org.eclipse.mylyn.wikitext.tests
mkdir orbitDeps
pushd orbitDeps
@@ -165,9 +179,10 @@ popd
%patch0
%patch1
-#%patch2
+%patch2
%patch3
%patch4 -p1
+%patch5
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
@@ -220,11 +235,20 @@ find -name feature.xml |
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.wikitext_feature \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
- -o `pwd`/orbitDeps
+ -o `pwd`/orbitDeps
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.cdt.mylyn \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
-o `pwd`/orbitDeps -d "cdt"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.wikitext.sdk \
+ -a "-DindividualSourceBundles=true -DjavacSource=1.5 -DexportSource=true -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+ -o `pwd`/orbitDeps -d "rse cdt"
+#%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.sdk_feature \
+# -a "-DindividualSourceBundles=true -DjavacSource=1.5 -DexportSource=true -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
+# -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \
+# -o `pwd`/orbitDeps -d "cdt"
+
%install
rm -rf %{buildroot}
@@ -235,6 +259,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{insta
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-trac
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-wikitext
+#install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-sdk
unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \
build/rpmBuild/org.eclipse.mylyn.commons.zip
@@ -257,9 +282,11 @@ unzip -q -o -d $RPM_BUILD_ROOT%{install_
unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks \
build/rpmBuild/org.eclipse.mylyn.web.tasks_feature.zip
unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-wikitext \
- build/rpmBuild/org.eclipse.mylyn.wikitext_feature.zip
+ build/rpmBuild/org.eclipse.mylyn.wikitext.sdk.zip
unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-cdt \
build/rpmBuild/org.eclipse.cdt.mylyn.zip
+#unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-sdk \
+# build/rpmBuild/org.eclipse.mylyn.sdk_feature.zip
pushd $RPM_BUILD_ROOT%{install_loc}/mylyn/eclipse/plugins
rm org.apache.commons.codec_*.jar
@@ -343,7 +370,14 @@ rm -rf %{buildroot}
%{install_loc}/mylyn
# FIXME: add the doc files back
+#%files
+#%defattr(-,root,root,-)
+#%{install_loc}/mylyn-sdk
+
%changelog
+* Tue Jul 27 2010 Charley Wang <chwang at redhat.com> 3.4.0-4
+- Add Wikitext SDK to eclipse-mylyn
+
* Wed Jul 21 2010 Charley Wang <chwang at redhat.com> 3.4.0-3
- Relax cdt requires, remove extraneous links, fix xmlrpc split
Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- fetch-mylyn.sh 14 Jul 2010 18:15:18 -0000 1.15
+++ fetch-mylyn.sh 27 Jul 2010 22:12:49 -0000 1.16
@@ -42,6 +42,7 @@ org.eclipse.mylyn.pde-feature \
org.eclipse.mylyn.pde.ui \
org.eclipse.mylyn.resources.tests \
org.eclipse.mylyn.resources.ui \
+org.eclipse.mylyn.sdk-feature \
org.eclipse.mylyn.tasks.bugs \
org.eclipse.mylyn.tasks.core \
org.eclipse.mylyn.tasks.search \
@@ -65,8 +66,10 @@ org.eclipse.mylyn.wikitext.confluence.co
org.eclipse.mylyn.wikitext.confluence.ui \
org.eclipse.mylyn.wikitext.core \
org.eclipse.mylyn.wikitext.help.ui \
+org.eclipse.mylyn.wikitext.help.sdk \
org.eclipse.mylyn.wikitext.mediawiki.core \
org.eclipse.mylyn.wikitext.mediawiki.ui \
+org.eclipse.mylyn.wikitext.sdk-feature \
org.eclipse.mylyn.wikitext.tasks.ui \
org.eclipse.mylyn.wikitext.tests \
org.eclipse.mylyn.wikitext.textile.core \
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources 14 Jul 2010 18:15:18 -0000 1.18
+++ sources 27 Jul 2010 22:12:49 -0000 1.19
@@ -1 +1 @@
-ee532947cc4839c60a34aa65372ba310 org.eclipse.mylyn-R_3_4_0-fetched-src.tar.bz2
+1205513f4349a94aecd415535699db8c org.eclipse.mylyn-R_3_4_0-fetched-src.tar.bz2
More information about the scm-commits
mailing list