[eclipse-mylyn-docs/f17] Upgraded to upstream 3.7.0 release.

[Krzysztof Daniel]

commit b5a32a619d234efbc2c3e5d10b1307b6117c1d9d
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Tue Mar 27 13:04:59 2012 +0200

    Upgraded to upstream 3.7.0 release.

 .gitignore                           |    3 ++
 eclipse-mylyn-docs-jsoupimport.patch |   11 +++++++
 eclipse-mylyn-docs.spec              |   49 ++++++++++++++++++++++------------
 sources                              |    2 +-
 4 files changed, 47 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7138c75..d6c4f17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ R_3_6_0.tar.bz2
 R_3_6_2.tar.bz2
 R_3_6_3.tar.bz2
 R_3_6_4.tar.bz2
+/R_3_7_0.tar.bz2
+/R_3_7_0
+/noarch
diff --git a/eclipse-mylyn-docs-jsoupimport.patch b/eclipse-mylyn-docs-jsoupimport.patch
new file mode 100644
index 0000000..40f67c0
--- /dev/null
+++ b/eclipse-mylyn-docs-jsoupimport.patch
@@ -0,0 +1,11 @@
+--- org.eclipse.mylyn.wikitext.core/build.properties.bak	2012-03-19 11:16:47.000000000 +0100
++++ org.eclipse.mylyn.wikitext.core/build.properties	2012-03-27 12:37:30.115590218 +0200
+@@ -24,7 +24,7 @@
+ dist=dist
+ bin=bin
+ 
+-jars.extra.classpath=platform:/plugin/org.apache.ant/lib/ant.jar,platform:/plugin/org.jsoup
++jars.extra.classpath=platform:/plugin/org.apache.ant/lib/ant.jar,../orbitDeps/jsoup.jar
+ jars.compile.order = .
+ 
+ plugin.name=org.eclipse.mylyn.wikitext
diff --git a/eclipse-mylyn-docs.spec b/eclipse-mylyn-docs.spec
index 5be84f2..90ed6e1 100644
--- a/eclipse-mylyn-docs.spec
+++ b/eclipse-mylyn-docs.spec
@@ -2,27 +2,29 @@
 %global install_loc         %{_datadir}/eclipse/dropins
 # Taken from update site so we match upstream
 #  http://download.eclipse.org/mylyn/archive/3.6.3/v20110608-1400/
-%global qualifier           v20110908-0706
+%global qualifier           v20120319-0200
 
 Name: eclipse-mylyn-docs
 Summary: Eclipse Mylyn documentation tools
-Version: 3.6.4
-Release: 2%{?dist}
+Version: 3.7.0
+Release: 1%{?dist}
 License: EPL
 URL: http://www.eclipse.org/mylyn/docs/
 
-Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.docs.git/snapshot/R_3_6_4.tar.bz2
+Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.docs.git/snapshot/R_3_7_0.tar.bz2
+Patch0: %{name}-jsoupimport.patch
 
 BuildArch: noarch
 
 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
-Requires: eclipse-mylyn >= 3.6.0
-Requires: eclipse-mylyn-commons >= 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: jsoup
+Requires: eclipse-mylyn >= 3.7.0
+Requires: eclipse-mylyn-commons >= 3.7.0
 
 
 %description
@@ -34,10 +36,11 @@ Extends the Eclipse Mylyn task editor to create a markup-aware editor.
 
 %package wikitext
 Summary: Mylyn WikiText
-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: jsoup
 Provides: eclipse-mylyn-wikitext = %{version}-%{release}
 Obsoletes: eclipse-mylyn-wikitext < %{version}-%{release}
 Group: Development/Tools
@@ -50,7 +53,7 @@ Enables parsing and display of lightweight markup (wiki text).
 
 %package htmltext
 Summary: Mylyn HtmlText
-Requires: eclipse-platform >= 1:3.5.0
+Requires: eclipse-platform >= 1:3.8.0
 Group: Development/Tools
 
 %description htmltext
@@ -58,8 +61,14 @@ Enables editing of HTML text.
 
 
 %prep
-%setup -q -n R_3_6_4
+%setup -q -n R_3_7_0
+rm -rf orbitDeps
+mkdir orbitDeps
+pushd orbitDeps
+ln -s %{_javadir}/jsoup.jar
+popd
 
+%patch0
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.wikitext_feature \
@@ -81,6 +90,9 @@ unzip -q -o -d %{buildroot}%{install_loc}/mylyn-docs-wikitext \
 unzip -q -o -d %{buildroot}%{install_loc}/mylyn-docs-htmltext \
  build/rpmBuild/org.eclipse.mylyn.htmltext.zip
 
+pushd %{buildroot}%{install_loc}/mylyn-docs-wikitext/eclipse/plugins
+ln -s %{_javadir}/jsoup.jar
+popd
 
 # eclips-mylyn-docs-wikitext
 
@@ -99,6 +111,9 @@ unzip -q -o -d %{buildroot}%{install_loc}/mylyn-docs-htmltext \
 
 
 %changelog
+* Tue Mar 27 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-1
+- Update to upstream 3.7.0 release.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 817286a..f17d4f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df3e251ef4b2b6108c3eb09fb28facf9  R_3_6_4.tar.bz2
+0a7d9af43634b8ae51fda6203f2f45db  R_3_7_0.tar.bz2