From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 1 Dec 2010 18:22:25 +0000 (+0000)
Subject: - drop _interwiki and _map patches, can be achieved with type aliases now
X-Git-Tag: auto/th/dokuwiki-plugin-data-20100608-3
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fdokuwiki-plugin-data-20100608-3;p=packages%2Fdokuwiki-plugin-data.git

- drop _interwiki and _map patches, can be achieved with type aliases now

Changed files:
    dokuwiki-plugin-data.spec -> 1.21
    helper-map.patch -> 1.2
    interwiki.patch -> 1.2
---

diff --git a/dokuwiki-plugin-data.spec b/dokuwiki-plugin-data.spec
index 990a842..46bd542 100644
--- a/dokuwiki-plugin-data.spec
+++ b/dokuwiki-plugin-data.spec
@@ -10,8 +10,6 @@ Group:		Applications/WWW
 Source0:	http://github.com/splitbrain/dokuwiki-plugin-%{plugin}/zipball/master#/%{plugin}-%{version}.zip
 # Source0-md5:	28a601cf6e20c7e8624db8113627a5af
 URL:		http://wiki.splitbrain.org/plugin:data
-Patch0:		interwiki.patch
-Patch1:		helper-map.patch
 Patch2:		separator-style.patch
 Patch3:		separate-rpmdb.patch
 BuildRequires:	rpmbuild(macros) >= 1.520
@@ -49,8 +47,6 @@ different to the repository plugin.
 %prep
 %setup -qc
 mv *-%{plugin}-*/* .
-%patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
diff --git a/helper-map.patch b/helper-map.patch
deleted file mode 100644
index 89e876d..0000000
--- a/helper-map.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- data/helper.php	2009-10-22 18:50:43.604400412 +0300
-+++ data/helper.php	2009-10-22 18:50:41.000000000 +0300
-@@ -109,6 +109,10 @@
- 					list($wikiName, $wikiUri) = explode('>', $val, 2);
-                     $outs[] = $R->interwikilink($val, NULL, $wikiName, $wikiUri, true);
-                     break;
-+                case 'map':
-+					$url = "http://maps.google.com/maps?q=".$val;
-+					$outs[] = '<a href="'.$url.'" class="urlextern" title="Google Map: '.hsc($val).'">'.hsc($val).'</a>';
-+                    break;
-                 case 'mail':
-                     list($id,$title) = explode(' ',$val,2);
-                     $id = obfuscate(hsc($id));
diff --git a/interwiki.patch b/interwiki.patch
deleted file mode 100644
index dfb160f..0000000
--- a/interwiki.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- data/helper.php	2009-02-13 16:26:25.000000000 +0200
-+++ data/helper.php	2009-07-28 16:50:23.128325628 +0300
-@@ -105,6 +105,10 @@
-                 case 'nspage':
-                     $outs[] = $R->internallink(":$key:$val",NULL,NULL,true);
-                     break;
-+                case 'interwiki':
-+					list($wikiName, $wikiUri) = explode('>', $val, 2);
-+                    $outs[] = $R->interwikilink($val, NULL, $wikiName, $wikiUri, true);
-+                    break;
-                 case 'mail':
-                     list($id,$title) = explode(' ',$val,2);
-                     $id = obfuscate(hsc($id));