packages: dokuwiki-plugin-data/dokuwiki-plugin-data.spec, dokuwiki-plugin-d...

[glen]

Author: glen                         Date: Tue Aug  4 08:07:54 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add plural.patch

---- Files affected:
packages/dokuwiki-plugin-data:
   dokuwiki-plugin-data.spec (1.5 -> 1.6) , plural.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec
diff -u packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec:1.5 packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec:1.6
--- packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec:1.5	Tue Jul 28 16:03:59 2009
+++ packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec	Tue Aug  4 10:07:48 2009
@@ -10,6 +10,7 @@
 # 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,6 +33,7 @@
 %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
@@ -70,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2009/08/04 08:07:48  glen
+- add plural.patch
+
 Revision 1.5  2009/07/28 14:03:59  glen
 - add interwiki.patch; rel 2
 

================================================================
Index: packages/dokuwiki-plugin-data/plural.patch
diff -u /dev/null packages/dokuwiki-plugin-data/plural.patch:1.1
--- /dev/null	Tue Aug  4 10:07:55 2009
+++ packages/dokuwiki-plugin-data/plural.patch	Tue Aug  4 10:07:49 2009
@@ -0,0 +1,18 @@
+--- 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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-plugin-data/dokuwiki-plugin-data.spec?r1=1.5&r2=1.6&f=u