summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-06-23 00:02:46 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-06-23 00:02:46 (GMT)
commita9e901feca7a7d98500606d96d0a349456c0a6c1 (patch)
tree197674f4298fe6548cc686a7c45ded58c93402aa
parente264f7d83f6c024046a6b8f2510d2dd7061b565f (diff)
downloadserver-a9e901feca7a7d98500606d96d0a349456c0a6c1.tar.gz
Fixed invalid package dependency on the Kolab package.
-rw-r--r--php-kolab/Kolab_Format/ChangeLog5
-rw-r--r--php-kolab/Kolab_Format/Kolab_Format.spec4
-rw-r--r--php-kolab/Kolab_Format/Kolab_Package_Dependency.patch32
-rw-r--r--release-notes.txt4
4 files changed, 44 insertions, 1 deletions
diff --git a/php-kolab/Kolab_Format/ChangeLog b/php-kolab/Kolab_Format/ChangeLog
index b8d61b3..cf7337a 100644
--- a/php-kolab/Kolab_Format/ChangeLog
+++ b/php-kolab/Kolab_Format/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-23 Gunnar Wrobel <p@rdus.de>
+
+ * Kolab_Format.spec: Fixed invalid package dependency on the Kolab
+ package.
+
2009-04-02 Gunnar Wrobel <p@rdus.de>
* Kolab_Format.spec: kolab/issue3525 (free/busy regeneration
diff --git a/php-kolab/Kolab_Format/Kolab_Format.spec b/php-kolab/Kolab_Format/Kolab_Format.spec
index 8e3f6ad..1a1b597 100644
--- a/php-kolab/Kolab_Format/Kolab_Format.spec
+++ b/php-kolab/Kolab_Format/Kolab_Format.spec
@@ -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 @@ Source: %{V_sourceurl}/%{V_package}-%{V_version}.tgz
# List of patches
Patch0: issue3525.patch
+Patch1: Kolab_Package_Dependency.patch
# Build Info
Prefix: %{l_prefix}
@@ -43,6 +44,7 @@ A package for reading/writing Kolab data formats.
%setup -n %{V_package}-%{V_version}
%patch -p2 -P 0
+ %patch -p0 -P 1
cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml
diff --git a/php-kolab/Kolab_Format/Kolab_Package_Dependency.patch b/php-kolab/Kolab_Format/Kolab_Package_Dependency.patch
new file mode 100644
index 0000000..b3c6de3
--- /dev/null
+++ b/php-kolab/Kolab_Format/Kolab_Package_Dependency.patch
@@ -0,0 +1,32 @@
+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';
++ }
+ }
diff --git a/release-notes.txt b/release-notes.txt
index 05cd81b..8f611a7 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -57,6 +57,10 @@ Changes between 2.2.3 and 2.2.x:
kolab/issue2244 (SpamAssassin uses DNS blacklists)
kolab/issue4176 (Adding RSS feed to Horde breaks portal screen)
+ - Kolab_Format-1.0.0-2010????
+
+ Fixed invalid package dependency on the Kolab package.
+
- kolab-webadmin-2.2.?-20??????
kolab/issue3499 (Kolab web admin does not use LDAP escaping)