rpms/eclipse-mylyn/devel .cvsignore, 1.7, 1.8 eclipse-mylyn-addfedoracustomizations.patch, 1.6, 1.7 eclipse-mylyn.spec, 1.34, 1.35 fetch-mylyn.sh, 1.8, 1.9 sources, 1.10, 1.11

[Andrew Overholt]

Author: overholt

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

Modified Files:
	.cvsignore eclipse-mylyn-addfedoracustomizations.patch 
	eclipse-mylyn.spec fetch-mylyn.sh sources 
Log Message:
* Tue Mar 17 2009 Andrew Overholt <overholt at redhat.com> 3.1.0-1
- 3.1.0
- Add wikitext sub-package.
- Update to new Fedora customizations plugin.
- Don't repack JARs as it breaks help content.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Oct 2008 11:17:45 -0000	1.7
+++ .cvsignore	17 Mar 2009 15:34:29 -0000	1.8
@@ -1,4 +1,2 @@
-fedoraeclipse-mylynbugzilla-0.0.2.zip
-org.eclipse.mylyn
-org.eclipse.mylyn-R_3_0_1-fetched-src.tar.bz2
-org.eclipse.mylyn-R_3_0_3-fetched-src.tar.bz2
+fedoraeclipse-mylynbugzilla-0.0.3.zip
+org.eclipse.mylyn-R_3_1_0-fetched-src.tar.bz2

eclipse-mylyn-addfedoracustomizations.patch:

Index: eclipse-mylyn-addfedoracustomizations.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn-addfedoracustomizations.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eclipse-mylyn-addfedoracustomizations.patch	21 Oct 2008 11:48:37 -0000	1.6
+++ eclipse-mylyn-addfedoracustomizations.patch	17 Mar 2009 15:34:29 -0000	1.7
@@ -1,8 +1,12 @@
-diff -up ./org.eclipse.mylyn.bugzilla-feature/feature.xml.withfedoracustomizations ./org.eclipse.mylyn.bugzilla-feature/feature.xml
---- ./org.eclipse.mylyn.bugzilla-feature/feature.xml.withfedoracustomizations	2008-10-01 23:06:51.000000000 +0200
-+++ ./org.eclipse.mylyn.bugzilla-feature/feature.xml	2008-10-21 13:46:09.000000000 +0200
-@@ -96,4 +96,11 @@ Java and all Java-based trademarks are t
-          version="3.0.3.qualifier"
+Index: feature.xml
+===================================================================
+RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla-feature/feature.xml,v
+retrieving revision 1.386
+diff -u -r1.386 feature.xml
+--- feature.xml	2 Nov 2008 21:08:04 -0000	1.386
++++ feature.xml	17 Mar 2009 13:38:41 -0000
+@@ -55,4 +55,11 @@
+          version="3.1.0.qualifier"
           unpack="false"/>
  
 +   <plugin


Index: eclipse-mylyn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- eclipse-mylyn.spec	24 Feb 2009 13:48:35 -0000	1.34
+++ eclipse-mylyn.spec	17 Mar 2009 15:34:29 -0000	1.35
@@ -2,37 +2,37 @@
 %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           v20081015-1500-e3x
+%define qualifier           v20090315-1500-e3x
+
+# Prevent brp-java-repack-jars from being run.  Spaces in the paths of
+# the help content are broken by it.
+%define __jar_repack 0
 
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
-Version: 3.0.3
-Release: 5%{?dist}
+Version: 3.1.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_0_3-fetched-src.tar.bz2 org.eclipse.mylyn
-Source0: org.eclipse.mylyn-R_3_0_3-fetched-src.tar.bz2
+# tar cjf org.eclipse.mylyn-R_3_1_0-fetched-src.tar.bz2 org.eclipse.mylyn
+Source0: org.eclipse.mylyn-R_3_1_0-fetched-src.tar.bz2
 Source1: fetch-mylyn.sh
-Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.2.zip
+Source2: http://overholt.fedorapeople.org/fedoraeclipse-mylynbugzilla-0.0.3.zip
 
+# We pre-populate the list of Bugzilla servers.
+# This patch is not suitable for upstream.
 Patch6: %{name}-addfedoracustomizations.patch
 # This is a dependency declared by the Orbit xmlrpc JAR.  We don't use
 # their JAR and the part of Mylyn using xmlrpc isn't using the
 # javax.xml.bind-using part(s) of xmlrpc.
+# This patch is not suitable for upstream.
 Patch7: %{name}-nojaxb.patch
 # Our xmlrpc packages are split into JARs differently than Orbit
+# This patch is not suitable for upstream.
 Patch8: %{name}-splitxmlrpc.patch
-# Red Hat Bugzilla is 3.0 now
-Patch9: %{name}-rhbz30.patch
-# Back-port patch for Bugzilla servers with large config files
-# Bug:  https://bugs.eclipse.org/bugs/show_bug.cgi?id=239435
-# Patch:  https://bugs.eclipse.org/bugs/attachment.cgi?id=109607
-# Tests part of patch taken out to avoid having to split it up by project
-# for application in %%prep.
-Patch10: %{name}-largebzconfigs.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -93,7 +93,7 @@
 Trac client integrated with Eclipse and Mylyn; can be used standalone.
 
 %package  java
-Summary:  Mylyn Focused UI
+Summary:  Mylyn Bridge:  Java Development
 Requires: eclipse-jdt
 Requires: %{name}-ide = %{version}-%{release}
 Group: Development/Tools
@@ -103,7 +103,7 @@
 element views and editors.
 
 %package  pde
-Summary:  Mylyn Focused UI
+Summary:  Mylyn Bridge:  Plug-in Development
 Requires: eclipse-pde
 Requires: %{name}-java = %{version}-%{release}
 Group: Development/Tools
@@ -112,7 +112,7 @@
 Mylyn Task-Focused UI extensions for PDE, Ant, Team Support and CVS.
 
 %package  webtasks
-Summary:  Mylyn Focused UI
+Summary:  Mylyn Connector:  Web Templates
 Requires: %{name} = %{version}-%{release}
 Requires: rome
 Requires: jdom
@@ -122,6 +122,15 @@
 Provides Task List integration for several web-based issue trackers
 and templates for example projects.
 
+%package  wikitext
+Summary:  Mylyn WikiText
+Requires: %{name} = %{version}-%{release}
+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.
+
 %prep
 %setup -q -n org.eclipse.mylyn
 unzip -q %{SOURCE2}
@@ -155,15 +164,11 @@
 #org.apache.axis_1.4.0.v200806030120.zip,unpack=true
 #org.apache.commons.discovery_0.2.0.v200806030120.zip,unpack=true
 
+pushd org.eclipse.mylyn.bugzilla-feature
 %patch6 -p0 -b .withfedoracustomizations
-pushd org.fedoraproject.mylyn.bugzilla
-%patch9
 popd
-#%patch7
+%patch7
 %patch8
-pushd org.eclipse.mylyn.bugzilla.core
-%patch10
-popd
 
 find -name feature.xml |
   while read f; do
@@ -207,6 +212,10 @@
  -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.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
 
 %install
 rm -rf %{buildroot}
@@ -216,6 +225,7 @@
 install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-pde
 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
 
 unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \
  build/rpmBuild/org.eclipse.mylyn_feature.zip
@@ -235,6 +245,8 @@
  build/rpmBuild/org.eclipse.mylyn.pde_feature.zip
 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
 
 pushd $RPM_BUILD_ROOT%{install_loc}/mylyn/eclipse/plugins
 rm org.apache.commons.codec_1.3.0.v20080530-1600.jar
@@ -279,16 +291,12 @@
 
 %files webtasks
 %defattr(-,root,root,-)
-#%{install_loc}/plugins/com.sun.syndication_*.jar
-#%{install_loc}/plugins/org.jdom_*.jar
-#%{install_loc}/plugins/org.eclipse.mylyn.web.tasks_*.jar
-#%dir %{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*
-#%doc %{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/license.html
-#%doc %{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/about.html
-#%doc %{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/epl-v10.html
-#%{install_loc}/features/org.eclipse.mylyn.web.tasks_feature_*/feature.xml
 %{install_loc}/mylyn-webtasks
 
+%files wikitext
+%defattr(-,root,root,-)
+%{install_loc}/mylyn-wikitext
+
 %files trac
 %defattr(-,root,root,-)
 %{install_loc}/mylyn-trac
@@ -319,9 +327,18 @@
 # FIXME:  add the doc files back
 
 %changelog
+* Tue Mar 17 2009 Andrew Overholt <overholt at redhat.com> 3.1.0-1
+- 3.1.0
+- Add wikitext sub-package.
+- Update to new Fedora customizations plugin.
+- Don't repack JARs as it breaks help content.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
+* Mon Feb 9 2009 Andrew Overholt <overholt at redhat.com> 3.0.4-1
+- 3.0.4
+
 * Wed Nov 12 2008 Andrew Overholt <overholt at redhat.com> 3.0.3-4
 - Add patch for e.o#239435 (rhbz#470356).
 
@@ -448,4 +465,4 @@
 - Use xmlrpc3 jars instead of xmlrpc
 
 * Fri Mar 16 2007 Andrew Overholt <overholt at redhat.com> 1.0-1
-- Initial build
\ No newline at end of file
+- Initial build


Index: fetch-mylyn.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/fetch-mylyn.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fetch-mylyn.sh	21 Oct 2008 11:17:45 -0000	1.8
+++ fetch-mylyn.sh	17 Mar 2009 15:34:29 -0000	1.9
@@ -50,7 +50,22 @@
 org.eclipse.mylyn.web.tasks-feature \
 org.eclipse.mylyn.web.ui \
 org.eclipse.mylyn.web.tasks \
+org.eclipse.mylyn.wikitext-feature \
+org.eclipse.mylyn.wikitext.confluence.core \
+org.eclipse.mylyn.wikitext.confluence.ui \
+org.eclipse.mylyn.wikitext.core \
+org.eclipse.mylyn.wikitext.mediawiki.core \
+org.eclipse.mylyn.wikitext.mediawiki.ui \
+org.eclipse.mylyn.wikitext.tasks.ui \
+org.eclipse.mylyn.wikitext.tests \
+org.eclipse.mylyn.wikitext.textile.core \
+org.eclipse.mylyn.wikitext.textile.ui \
+org.eclipse.mylyn.wikitext.tracwiki.core \
+org.eclipse.mylyn.wikitext.tracwiki.ui \
+org.eclipse.mylyn.wikitext.twiki.core \
+org.eclipse.mylyn.wikitext.twiki.ui \
+org.eclipse.mylyn.wikitext.ui \
 ; do
 cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools \
-export -r R_3_0_3 org.eclipse.mylyn/$f;
+export -r R_3_1_0 org.eclipse.mylyn/$f;
 done


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	21 Oct 2008 11:17:45 -0000	1.10
+++ sources	17 Mar 2009 15:34:29 -0000	1.11
@@ -1,2 +1,2 @@
-9bb866cc22d0cdca66074b2aaafb4825  fedoraeclipse-mylynbugzilla-0.0.2.zip
-720f9143cbe53626e4d4b52958d66ddd  org.eclipse.mylyn-R_3_0_3-fetched-src.tar.bz2
+ccf62375bb3dfe3d0d3bab4323765c5f  fedoraeclipse-mylynbugzilla-0.0.3.zip
+9443eb57da9533fbc3e8b2ca39acd5a1  org.eclipse.mylyn-R_3_1_0-fetched-src.tar.bz2