rpms/eclipse-mylyn/devel fetch-mylyn.sh, 1.11, 1.12 eclipse-mylyn.spec, 1.41, 1.42 .cvsignore, 1.10, 1.11 eclipse-mylyn-wikitext_builddoc.patch, 1.2, 1.3 eclipse-mylyn-addfedoracustomizations.patch, 1.9, 1.10 sources, 1.13, 1.14

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-mylyn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1018/devel

Modified Files:
	fetch-mylyn.sh eclipse-mylyn.spec .cvsignore 
	eclipse-mylyn-wikitext_builddoc.patch 
	eclipse-mylyn-addfedoracustomizations.patch sources 
Log Message:
- Update to 3.3.0.
- Add cdt bridge.
- Remove BR/R which are required by eclipse itself now.


Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fetch-mylyn.sh	4 Aug 2009 13:46:22 -0000	1.11
+++ fetch-mylyn.sh	27 Oct 2009 09:25:54 -0000	1.12
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+rm -fr org.eclipse.mylyn
+
 for f in \
 org.eclipse.mylyn \
 org.eclipse.mylyn.bugzilla.core \
@@ -20,6 +22,7 @@ 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 \
@@ -67,7 +70,11 @@ org.eclipse.mylyn.wikitext.tracwiki.ui \
 org.eclipse.mylyn.wikitext.twiki.core \
 org.eclipse.mylyn.wikitext.twiki.ui \
 org.eclipse.mylyn.wikitext.ui \
+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_2_1 org.eclipse.mylyn/$f;
+export -r R_3_3_0 org.eclipse.mylyn/$f;
 done
+
+tar cjf org.eclipse.mylyn-R_3_3_0-fetched-src.tar.bz2 org.eclipse.mylyn


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- eclipse-mylyn.spec	22 Sep 2009 11:29:18 -0000	1.41
+++ eclipse-mylyn.spec	27 Oct 2009 09:25:54 -0000	1.42
@@ -1,8 +1,8 @@
 %define eclipse_base        %{_libdir}/eclipse
 %define install_loc         %{_datadir}/eclipse/dropins
 # Taken from update site so we match upstream
-# http://download.eclipse.org/tools/mylyn/update/e3.4/
-%define qualifier           v20090722-0200-e3x
+# http://download.eclipse.org/tools/mylyn/update/e3.5/
+%define qualifier           v20091015-0500-e3x
 
 # Prevent brp-java-repack-jars from being run.  Spaces in the paths of
 # the help content are broken by it.
@@ -10,15 +10,14 @@
 
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
-Version: 3.2.1
-Release: 2%{?dist}
+Version: 3.3.0
+Release: 1%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn
 
 # mkdir temp && cd temp
 # sh fetch-mylyn.sh
-# tar cjf org.eclipse.mylyn-R_3_2_1-fetched-src.tar.bz2 org.eclipse.mylyn
-Source0: org.eclipse.mylyn-R_3_2_1-fetched-src.tar.bz2
+Source0: org.eclipse.mylyn-R_3_3_0-fetched-src.tar.bz2
 Source1: fetch-mylyn.sh
 Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.3.zip
 
@@ -42,10 +41,7 @@ BuildRequires:    java-devel >= 1.5.0
 BuildArch: noarch
 
 BuildRequires: eclipse-pde >= 1:3.4.0
-BuildRequires: eclipse-cvs-client >= 1:3.4.0
-BuildRequires: jakarta-commons-codec >= 1.3-9
-BuildRequires: jakarta-commons-httpclient >= 1:3.1-0.3
-BuildRequires: jakarta-commons-logging >= 1.0.4-7.7
+BuildRequires: eclipse-cdt
 BuildRequires: jakarta-commons-lang >= 2.3-2.3
 BuildRequires: ws-commons-util >= 1.0.1-5
 BuildRequires: xmlrpc3-client >= 3.0-2.8
@@ -54,10 +50,6 @@ BuildRequires: ws-jaxme >= 0.5.1-2.4
 BuildRequires: rome
 BuildRequires: jdom >= 1.0-5.5
 Requires: eclipse-platform >= 1:3.4.0
-Requires: eclipse-cvs-client >= 1:3.4.0
-Requires: jakarta-commons-codec >= 1.3-9
-Requires: jakarta-commons-httpclient >= 1:3.1-0.3
-Requires: jakarta-commons-logging >= 1.0.4-7.7
 Requires: jakarta-commons-lang >= 2.3-2.3
 Requires: ws-commons-util >= 1.0.1-5
 Requires: xmlrpc3-client >= 3.0-2.8
@@ -132,6 +124,16 @@ Group: Development/Tools
 Enables parsing and display of lightweight markup (wiki text).  Extends
 the Mylyn task editor to create a markup-aware editor.
 
+%package  cdt
+Summary:  Mylyn Bridge:  C/C++ Development
+Requires: %{name} = %{version}-%{release}
+Requires: eclipse-cdt
+Group: Development/Tools
+
+%description cdt
+Mylyn Task-Focused UI extensions for cDT.  Provides focusing of C/C++
+element views and editors.
+
 %prep
 %setup -q -n org.eclipse.mylyn
 unzip -q %{SOURCE2}
@@ -141,11 +143,8 @@ rm -rf *tests*
 
 mkdir orbitDeps
 pushd orbitDeps
-ln -s %{_javadir}/commons-codec-1.3.jar org.apache.commons.codec_1.3.0.jar
-ln -s %{_javadir}/commons-httpclient.jar org.apache.commons.httpclient_3.1.0.jar
 ln -s %{_javadir}/commons-lang.jar org.apache.commons.lang_2.3.0.jar
 ln -s %{_javadir}/commons-logging-api.jar org.apache.commons.logging.api_1.0.4.jar
-ln -s %{_javadir}/commons-logging.jar org.apache.commons.logging_1.0.4.jar
 ln -s %{_javadir}/xmlrpc3-client-3.0.jar org.apache.xmlrpc.client_3.0.0.v20080530-1550.jar
 ln -s %{_javadir}/xmlrpc3-common-3.0.jar org.apache.xmlrpc.common_3.0.0.v20080530-1550.jar
 ln -s %{_javadir}/ws-commons-util-1.0.1.jar org.apache.ws.commons.util_1.0.0.v20080530-1550.jar
@@ -218,6 +217,10 @@ find -name feature.xml |
  -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.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"
 
 %install
 rm -rf %{buildroot}
@@ -249,17 +252,16 @@ unzip -q -o -d $RPM_BUILD_ROOT%{install_
  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
+unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-cdt \
+ build/rpmBuild/org.eclipse.cdt.mylyn.zip
 
 pushd $RPM_BUILD_ROOT%{install_loc}/mylyn/eclipse/plugins
 rm org.apache.commons.codec_1.3.0.v20080530-1600.jar
 rm org.apache.commons.httpclient_3.1.0.v20080605-1935.jar
 rm org.apache.commons.lang_2.3.0.v200803061910.jar
 rm org.apache.commons.logging_1.0.4.v20080605-1930.jar
-ln -s %{_javadir}/commons-codec-1.3.jar org.apache.commons.codec_1.3.0.jar
-ln -s %{_javadir}/commons-httpclient.jar org.apache.commons.httpclient_3.1.0.jar
 ln -s %{_javadir}/commons-lang.jar org.apache.commons.lang_2.3.0.jar
 ln -s %{_javadir}/commons-logging-api.jar org.apache.commons.logging.api_1.0.4.jar
-ln -s %{_javadir}/commons-logging.jar org.apache.commons.logging_1.0.4.jar
 popd
 
 pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-trac/eclipse/plugins
@@ -323,12 +325,21 @@ rm -rf %{buildroot}
 #%doc %{install_loc}/features/org.eclipse.mylyn.pde_feature_*/epl-v10.html
 #%doc %{install_loc}/features/org.eclipse.mylyn.pde_feature_*/about.html
 
+%files cdt
+%defattr(-,root,root,-)
+%{install_loc}/mylyn-cdt
+
 %files
 %defattr(-,root,root,-)
 %{install_loc}/mylyn
 # FIXME:  add the doc files back
 
 %changelog
+* Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 3.3.0-1
+- Update to 3.3.0.
+- Add cdt bridge.
+- Remove BR/R which are required by eclipse itself now.
+
 * Tue Sep 22 2009 Alexander Kurtakov <akurtako at redhat.com> 3.2.1-2
 - Add patch for correct building of o.e.wikitext.help.ui.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	4 Aug 2009 13:46:22 -0000	1.10
+++ .cvsignore	27 Oct 2009 09:25:54 -0000	1.11
@@ -1,3 +1,4 @@
 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

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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eclipse-mylyn-wikitext_builddoc.patch	22 Sep 2009 11:29:18 -0000	1.2
+++ eclipse-mylyn-wikitext_builddoc.patch	27 Oct 2009 09:25:54 -0000	1.3
@@ -1,9 +1,9 @@
---- org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF.sav	2009-06-27 23:09:32.000000000 +0300
-+++ org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF	2009-09-22 14:07:05.676264614 +0300
-@@ -6,5 +6,7 @@ Bundle-Version: 1.1.1.qualifier
+--- org.eclipse.mylyn.wikitext.help.ui/META-INF/MANIFEST.MF.orig	2009-08-13 22:57:10.000000000 +0300
++++ 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.0.qualifier
  Bundle-Vendor: %Bundle-Vendor.0
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Bundle-ActivationPolicy: lazy
 -Require-Bundle: org.eclipse.help
 +Require-Bundle: org.eclipse.help,
 +      org.eclipse.mylyn.wikitext.core,

eclipse-mylyn-addfedoracustomizations.patch:
 feature.xml |    7 +++++++
 1 file changed, 7 insertions(+)

Index: eclipse-mylyn-addfedoracustomizations.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-addfedoracustomizations.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- eclipse-mylyn-addfedoracustomizations.patch	4 Aug 2009 13:46:22 -0000	1.9
+++ eclipse-mylyn-addfedoracustomizations.patch	27 Oct 2009 09:25:54 -0000	1.10
@@ -8,7 +8,7 @@ diff -u -r1.386.2.1 feature.xml
 --- feature.xml	11 Apr 2009 02:13:56 -0000	1.386.2.1
 +++ feature.xml	22 Apr 2009 14:16:52 -0000
 @@ -55,4 +55,11 @@
-          version="3.2.1.qualifier"
+          version="3.3.0.qualifier"
           unpack="false"/>
  
 +   <plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	4 Aug 2009 13:46:22 -0000	1.13
+++ sources	27 Oct 2009 09:25:54 -0000	1.14
@@ -1,2 +1,2 @@
 ccf62375bb3dfe3d0d3bab4323765c5f  fedoraeclipse-mylynbugzilla-0.0.3.zip
-729610b5594f067112ca8d87539ea77b  org.eclipse.mylyn-R_3_2_1-fetched-src.tar.bz2
+7aea92d0c52b84556723afbaafeb4837  org.eclipse.mylyn-R_3_3_0-fetched-src.tar.bz2