From: Elan Ruusamäe <glen@pld-linux.org>
Date: Fri, 7 Aug 2009 11:43:48 +0000 (+0000)
Subject: - plural patch was bad idea; rel 3
X-Git-Tag: auto/th/dokuwiki-plugin-data-20090810-2~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdokuwiki-plugin-data.git;a=commitdiff_plain;h=9a7012bd4f154dec8eca3688d91b0730374afc5e

- plural patch was bad idea; rel 3

Changed files:
    dokuwiki-plugin-data.spec -> 1.7
    plural.patch -> 1.2
---

diff --git a/dokuwiki-plugin-data.spec b/dokuwiki-plugin-data.spec
index ea838f0..3850311 100644
--- a/dokuwiki-plugin-data.spec
+++ b/dokuwiki-plugin-data.spec
@@ -2,14 +2,13 @@
 Summary:	DokuWiki Structured Data Plugin
 Name:		dokuwiki-plugin-%{plugin}
 Version:	20090213
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://dev.splitbrain.org/download/snapshots/data-plugin-latest.tgz
 # Source0-md5:	6a3ee212496a60a343b62246e8002957
 URL:		http://wiki.splitbrain.org/plugin:data
 Patch0:		interwiki.patch
-Patch1:		plural.patch
 BuildRequires:	rpmbuild(macros) >= 1.520
 Requires:	dokuwiki >= 20090214b-5
 Requires:	php(sqlite)
@@ -32,7 +31,6 @@ different to the repository plugin.
 %prep
 %setup -q -n %{plugin}
 %patch0 -p1
-%patch1 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
diff --git a/plural.patch b/plural.patch
deleted file mode 100644
index f3c4e37..0000000
--- a/plural.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- data/helper.php	2009-08-04 11:06:52.614221159 +0300
-+++ tmp/helper.php	2009-08-04 11:06:34.000000000 +0300
-@@ -148,10 +148,13 @@
-      * @returns array with key, type, ismulti, title
-      */
-     function _column($col){
--        if(strtolower(substr($col,-1)) == 's'){
-+        if (strtolower(substr($col,-2)) == 'es') {
-+            $col = substr($col,0,-2);
-+            $multi = true;
-+        } elseif (strtolower(substr($col,-1)) == 's') {
-             $col = substr($col,0,-1);
-             $multi = true;
--        }else{
-+        } else {
-             $multi = false;
-         }
-         list($key,$type) = explode('_',$col,2);