gunnar: server/kolab-webclient issue4395.patch, NONE, 1.1.2.1 ChangeLog, 1.10.2.22, 1.10.2.23 Makefile, 1.6.2.4, 1.6.2.5 activesync_conf.patch, 1.1.2.3, 1.1.2.4 kolab-webclient.spec, 1.23.2.24, 1.23.2.25
cvs at kolab.org
cvs at kolab.org
Mon Jun 14 08:42:30 CEST 2010
Author: gunnar
Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv23815/kolab-webclient
Modified Files:
Tag: kolab_2_2_branch
ChangeLog Makefile activesync_conf.patch kolab-webclient.spec
Added Files:
Tag: kolab_2_2_branch
issue4395.patch
Log Message:
kolab/issue4395 (freebusy list contains time of an event, which is from a now *not* shared, before shared calendar folder)
--- NEW FILE: issue4395.patch ---
diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
--- a/lib/Horde/Kolab/Storage/Folder.php 2010-05-04 23:44:49.522328256 +0200
+++ b/lib/Horde/Kolab/Storage/Folder.php 2010-05-06 07:46:01.507036608 +0200
@@ -414,13 +414,19 @@
if (is_a($result, 'PEAR_Error')) {
return $result;
}
+ unset($params['xfbaccess']);
}
if (isset($params['fbrelevance'])) {
- $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
+ $result = $this->setFbrelevance($params['fbrelevance']);
if (is_a($result, 'PEAR_Error')) {
return $result;
}
+ unset($params['fbrelevance']);
}
+ if (empty($params)) {
+ continue;
+ }
+ $value = serialize($params);
}
// setAnnotation apparently does not suppoort UTF-8 nor any special characters
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/ChangeLog,v
retrieving revision 1.10.2.22
retrieving revision 1.10.2.23
diff -u -d -r1.10.2.22 -r1.10.2.23
--- ChangeLog 8 Jun 2010 19:17:10 -0000 1.10.2.22
+++ ChangeLog 14 Jun 2010 06:42:28 -0000 1.10.2.23
@@ -1,3 +1,9 @@
+2010-06-14 Gunnar Wrobel <p at rdus.de>
+
+ * issue4395.patch: kolab/issue4395 (freebusy list contains
+ time of an event, which is from a now *not* shared, before shared
+ calendar folder)
+
2010-06-08 Gunnar Wrobel <p at rdus.de>
* kolab-webclient.spec:
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/Makefile,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -d -r1.6.2.4 -r1.6.2.5
--- Makefile 8 Jun 2010 19:17:10 -0000 1.6.2.4
+++ Makefile 14 Jun 2010 06:42:28 -0000 1.6.2.5
@@ -13,7 +13,7 @@
PASSWD_VERSION = $(shell grep "%define[ ]*V_passwd_version" *.spec | sed -e "s/.*V_passwd_version\s*\([0-9._a-z]*\).*/\1/")
RELEASE = ${YEAR}${MONTH}${DAY}
-PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch activesync_conf.patch
+PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch activesync_conf.patch issue4395.patch
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
Index: activesync_conf.patch
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/activesync_conf.patch,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- activesync_conf.patch 8 Jun 2010 19:17:10 -0000 1.1.2.3
+++ activesync_conf.patch 14 Jun 2010 06:42:28 -0000 1.1.2.4
@@ -591,7 +591,8 @@
+ unset($params['xfbaccess']);
}
if (isset($params['fbrelevance'])) {
- $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
+- $result = $this->setFbrelevance(join(' ', $params['fbrelevance']));
++ $result = $this->setFbrelevance($params['fbrelevance']);
if (is_a($result, 'PEAR_Error')) {
return $result;
}
Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Attic/kolab-webclient.spec,v
retrieving revision 1.23.2.24
retrieving revision 1.23.2.25
diff -u -d -r1.23.2.24 -r1.23.2.25
--- kolab-webclient.spec 8 Jun 2010 19:17:10 -0000 1.23.2.24
+++ kolab-webclient.spec 14 Jun 2010 06:42:28 -0000 1.23.2.25
@@ -1,9 +1,9 @@
# Versions
%define V_horde_name horde-webmail
%define V_package kolab-webclient
-%define V_year 2009
-%define V_month 12
-%define V_day 02
+%define V_year 2010
+%define V_month 06
+%define V_day 14
%define V_version 1.2.0
%define V_source_version 1.2
%define V_passwd_version 3.0.1
@@ -85,7 +85,8 @@
# List of Patches
Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/%{V_version}/horde-webmail-%{V_version}_kolab_openpkg.patch
-Patch1: activesync_conf.patch
+Patch1: issue4395.patch
+Patch2: activesync_conf.patch
# Build Info
Prefix: %{l_prefix}
@@ -114,6 +115,8 @@
cd %{V_horde_name}-%{V_source_version}
%patch -p2 -P 0
%if "%{with_activesync}" == "yes"
+ %patch -p1 -P 2
+%else
%patch -p1 -P 1
%endif
cd ..
More information about the commits
mailing list