gunnar: server/php-kolab/Kolab_Format Kolab_Package_Dependency.patch, NONE, 1.1.2.1 ChangeLog, 1.3.2.1, 1.3.2.2 Kolab_Format.spec, 1.9.2.2, 1.9.2.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Format
In directory doto:/tmp/cvs-serv18299/d/Kolab_Format

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Format.spec 
Added Files:
      Tag: kolab_2_2_branch
	Kolab_Package_Dependency.patch 
Log Message:
Fixed invalid package dependency on the Kolab package.

--- NEW FILE: Kolab_Package_Dependency.patch ---
diff -u -B -r1.2.2.6 task.php
--- lib/Horde/Kolab/Format/XML/task.php	12 Dec 2008 11:39:04 -0000	1.2.2.6
+++ lib/Horde/Kolab/Format/XML/task.php	22 Jun 2010 23:56:53 -0000
@@ -154,7 +154,7 @@
             $object['parent'] = null;
         }
 
-        $object['completed'] = (bool) Kolab::percentageToBoolean($object['completed']);
+        $object['completed'] = (bool) $this->percentageToBoolean($object['completed']);
 
         if (isset($object['organizer']) && isset($object['organizer']['smtp-address'])) {
             $object['assignee'] = $object['organizer']['smtp-address'];
@@ -184,8 +184,18 @@
 
         $object['estimate'] = number_format($object['estimate'], 2);
 
-        $object['completed'] = Kolab::BooleanToPercentage($object['completed']);
+        $object['completed'] = $this->booleanToPercentage($object['completed']);
 
         return $this->_saveArray($root, $object, $this->_fields_specific);
     }
+
+    function percentageToBoolean($percentage)
+    {
+        return $percentage == 100 ? '1' : '0';
+    }
+
+    function booleanToPercentage($boolean)
+    {
+        return $boolean ? '100' : '0';
+    }
 }

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/ChangeLog,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- ChangeLog	2 Apr 2009 07:29:45 -0000	1.3.2.1
+++ ChangeLog	23 Jun 2010 00:02:46 -0000	1.3.2.2
@@ -1,3 +1,8 @@
+2010-06-23  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Format.spec: Fixed invalid package dependency on the Kolab
+	package.
+
 2009-04-02  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Format.spec: kolab/issue3525 (free/busy regeneration

Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Attic/Kolab_Format.spec,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -d -r1.9.2.2 -r1.9.2.3
--- Kolab_Format.spec	2 Apr 2009 09:48:45 -0000	1.9.2.2
+++ Kolab_Format.spec	23 Jun 2010 00:02:46 -0000	1.9.2.3
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Format
 %define         V_version 1.0.0
-%define         V_release 20090402
+%define         V_release 20090623
 %define         V_sourceurl http://pear.horde.org/get
 
 # Package Information
@@ -20,6 +20,7 @@
 
 # List of patches
 Patch0:    issue3525.patch
+Patch1:    Kolab_Package_Dependency.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -43,6 +44,7 @@
 	%setup -n %{V_package}-%{V_version}
 
         %patch -p2 -P 0
+        %patch -p0 -P 1
 
 	cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml