gunnar: server/php-kolab/Kolab_Freebusy issue3450.patch, NONE, 1.1.2.1 Kolab_FreeBusy.spec, 1.18.2.1, 1.18.2.2 Makefile, 1.6, 1.6.2.1

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy
In directory doto:/tmp/cvs-serv30359/php-kolab/Kolab_Freebusy

Modified Files:
      Tag: kolab_2_2_branch
	Kolab_FreeBusy.spec Makefile 
Added Files:
      Tag: kolab_2_2_branch
	issue3450.patch 
Log Message:
 kolab/issue3450 (freebusy/user at example.com.ifb returns extended free/busy information)

Upstream merges:

http://cvs.horde.org/diff.php/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php?rt=horde&r1=1.17.2.2&r2=1.17.2.3&ty=u
  http://cvs.horde.org/diff.php/framework/Kolab_FreeBusy/package.xml?rt=horde&r1=1.22.2.2&r2=1.22.2.3&ty=u


--- NEW FILE: issue3450.patch ---
diff --git a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php
index 861e1c1..e26b1c7 100644
--- a/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php
+++ b/framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy/Cache.php
@@ -252,7 +252,8 @@ class Horde_Kolab_FreeBusy_Cache {
         }
         $c_file = str_replace("\0", '', str_replace('.', '^', $user . '/' . $owner));
 
-        $c_vcal = &new Horde_Kolab_FreeBusy_Cache_File_vcal($this->_cache_dir, $c_file);
+        $c_vcal = &new Horde_Kolab_FreeBusy_Cache_File_vcal($this->_cache_dir,
+							    $c_file, $extended);
 
         /* If the current vCal cache did not expire, we can deliver it */
         if (!$c_vcal->expired($files)) {
@@ -1143,6 +1144,19 @@ class Horde_Kolab_FreeBusy_Cache_File_vcal extends Horde_Kolab_FreeBusy_Cache_Fi
     var $_data;
 
     /**
+     * Construct the Horde_Kolab_FreeBusy_Cache_File_vcal instance.
+     *
+     * @param string  $cache_dir The path to the cache direcory.
+     * @param string  $filename  The file name of the cache file.
+     * @param boolean $extended  Does the cache hold extended data?
+     */
+    function Horde_Kolab_FreeBusy_Cache_File_vcal($cache_dir, $filename, $extended)
+    {
+        $extension = empty($extended) ? 'vc' : 'xvc';
+        parent::Horde_Kolab_FreeBusy_Cache_File($cache_dir, $filename, $extension);
+    }
+
+    /**
      * Store free/busy infomation in the cache file.
      *
      * @param Horde_iCalendar $vcal   A reference to the data object.

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -d -r1.18.2.1 -r1.18.2.2
--- Kolab_FreeBusy.spec	20 Mar 2009 07:56:29 -0000	1.18.2.1
+++ Kolab_FreeBusy.spec	20 Mar 2009 22:11:48 -0000	1.18.2.2
@@ -21,6 +21,7 @@
 # List of patches
 Patch0:    kolab_issue3313.patch
 Patch1:    issue3438.patch
+Patch2:    issue3450.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -55,6 +56,7 @@
 	%setup -n %{V_package}-%{V_version}
         %patch -p1 -P 0
         %patch -p3 -P 1
+        %patch -p3 -P 2
         cp %{S:1} .
 
 %build

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Makefile,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- Makefile	26 Feb 2009 17:05:15 -0000	1.6
+++ Makefile	20 Mar 2009 22:11:48 -0000	1.6.2.1
@@ -21,7 +21,7 @@
 
 SOURCE_URL=http://pear.horde.org/get
 SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog kolab_issue3313.patch issue3438.patch package.xml
+EXTRA=ChangeLog kolab_issue3313.patch issue3438.patch issue3450.patch package.xml
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm