gunnar: server/php-kolab/Kolab_Filter issue3965.patch, NONE, 1.1.2.1 Kolab_Filter.spec, 1.19.2.17, 1.19.2.18 Makefile, 1.8.2.15, 1.8.2.16
cvs at kolab.org
cvs at kolab.org
Thu Dec 3 15:11:03 CET 2009
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv17991/php-kolab/Kolab_Filter
Modified Files:
Tag: kolab_2_2_branch
Kolab_Filter.spec Makefile
Added Files:
Tag: kolab_2_2_branch
issue3965.patch
Log Message:
kolab/issue3965 (Always accept: invitations get lost when Calendar folder ist not writable for the calendar user)
--- NEW FILE: issue3965.patch ---
diff -u -B -r1.15.2.10 Resource.php
--- a/lib/Horde/Kolab/Resource.php 16 Nov 2009 19:26:34 -0000 1.15.2.10
+++ b/lib/Horde/Kolab/Resource.php 3 Dec 2009 14:04:55 -0000
@@ -211,7 +211,7 @@
require_once 'Horde/Kolab/Storage/List.php';
$list = &Kolab_List::singleton();
$default = $list->getForeignDefault($id, 'event');
- if (!$default) {
+ if (!$default || is_a($default, 'PEAR_Error')) {
$default = &new Kolab_Folder();
$default->setList($list);
$default->setName($conf['kolab']['filter']['calendar_store']);
Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.17
retrieving revision 1.19.2.18
diff -u -d -r1.19.2.17 -r1.19.2.18
--- Kolab_Filter.spec 25 Nov 2009 13:42:20 -0000 1.19.2.17
+++ Kolab_Filter.spec 3 Dec 2009 14:11:01 -0000 1.19.2.18
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_Filter
%define V_version 0.1.4
-%define V_release 20091125
+%define V_release 20091203
# Package Information
Name: %{V_package}
@@ -34,6 +34,7 @@
Patch12: issue3464.patch
Patch13: issue3594.patch
Patch14: issue973.patch
+Patch15: issue3965.patch
# Build Info
Prefix: %{l_prefix}
@@ -83,6 +84,7 @@
%patch -p1 -P 12
%patch -p1 -P 13
%patch -p1 -P 14
+ %patch -p1 -P 15
cp %{S:1} .
%build
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.15
retrieving revision 1.8.2.16
diff -u -d -r1.8.2.15 -r1.8.2.16
--- Makefile 25 Nov 2009 13:42:20 -0000 1.8.2.15
+++ Makefile 3 Dec 2009 14:11:01 -0000 1.8.2.16
@@ -6,7 +6,7 @@
SOURCE_URL=http://pear.horde.org/get
SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch issue973.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog revert_issue2495.patch issue2499_2.patch issue3435.patch issue3192.patch issue3441.patch issue3464.patch issue3521.patch issue3558.patch issue3568.patch issue3594.patch issue3610.patch issue3768.patch issue3868.patch issue3965.patch issue973.patch dovecotlda-quoting.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
More information about the commits
mailing list