[eclipse-mylyn] - Backport patch for wikitext to work with Fedora wiki.

[Alexander Kurtakov]

commit 2f5690ca2b14fb495d9584783603257d296b9c97
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Sep 1 15:08:36 2010 +0300

    - Backport patch for wikitext to work with Fedora wiki.

 eclipse-mylyn.spec              |    7 ++++++-
 fix_mediawiki_image_fetch.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index b66c31d..9a44d9c 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -11,7 +11,7 @@
 Name: eclipse-mylyn
 Summary: Mylyn is a task-focused UI for Eclipse
 Version: 3.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: EPL and ASL 2.0
 URL: http://www.eclipse.org/mylyn
 
@@ -32,6 +32,7 @@ Patch2: %{name}-wikitext_builddoc.patch
 Patch3: %{name}-nosoap.patch
 Patch4: %{name}-nocdtversion.patch
 Patch5: %{name}-clean-sdk.patch
+Patch6: fix_mediawiki_image_fetch.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -183,6 +184,7 @@ popd
 %patch3
 %patch4 -p1
 %patch5
+%patch6 -b .sav
 
 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
 
@@ -375,6 +377,9 @@ rm -rf %{buildroot}
 #%{install_loc}/mylyn-sdk
 
 %changelog
+* Wed Sep 1 2010 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-2
+- Backport patch for wikitext to work with Fedora wiki.
+
 * Tue Aug 31 2010 Alexander Kurtakov <akurtako at redhat.com> 3.4.1-1
 - Update to 3.4.1.
 
diff --git a/fix_mediawiki_image_fetch.patch b/fix_mediawiki_image_fetch.patch
new file mode 100644
index 0000000..08493b4
--- /dev/null
+++ b/fix_mediawiki_image_fetch.patch
@@ -0,0 +1,29 @@
+--- org.eclipse.mylyn.wikitext.mediawiki.core/src_ant/org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/MediaWikiApiImageFetchingStrategy.java.sav	2010-06-09 02:05:09.000000000 +0300
++++ org.eclipse.mylyn.wikitext.mediawiki.core/src_ant/org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/MediaWikiApiImageFetchingStrategy.java	2010-09-01 13:52:52.894189355 +0300
+@@ -42,7 +42,7 @@ import org.xml.sax.XMLReader;
+ 
+ class MediaWikiApiImageFetchingStrategy extends ImageFetchingStrategy {
+ 
+-	private final Pattern imageTitlePattern = Pattern.compile("Image:(.+)"); //$NON-NLS-1$
++	private final Pattern imageTitlePattern = Pattern.compile("(?:Image|File):(.+)"); //$NON-NLS-1$
+ 
+ 	private URL url;
+ 
+@@ -112,10 +112,14 @@ class MediaWikiApiImageFetchingStrategy 
+ 					String name = titleMatcher.group(1);
+ 					name = name.replace(' ', '_');
+ 					String qualifiedUrl = base;
+-					if (imageUrl.startsWith("/")) { //$NON-NLS-1$
+-						qualifiedUrl += imageUrl.substring(0);
++					if (imageUrl.matches("https?://.*")) { //$NON-NLS-1$
++						qualifiedUrl = imageUrl;
+ 					} else {
+-						qualifiedUrl += imageUrl;
++						if (imageUrl.startsWith("/")) { //$NON-NLS-1$
++							qualifiedUrl += imageUrl.substring(0);
++						} else {
++							qualifiedUrl += imageUrl;
++						}
+ 					}
+ 
+ 					log("Fetching " + qualifiedUrl, Project.MSG_INFO); //$NON-NLS-1$