gunnar: server/php-kolab/Kolab_Freebusy kolab_issue3313.patch, NONE, 1.1 package.xml, 1.2, 1.3 ChangeLog, 1.23, 1.24 Kolab_FreeBusy.spec, 1.14, 1.15

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	ChangeLog Kolab_FreeBusy.spec 
Added Files:
	kolab_issue3313.patch package.xml 
Log Message:
 kolab/issue3313 (free/busy regeneration as manager broken in 2.2.1-beta1)

--- NEW FILE: kolab_issue3313.patch ---
diff -r 0bbf34c5e252 framework/Kolab_FreeBusy/lib/Horde/Kolab/FreeBusy.php
--- a/lib/Horde/Kolab/FreeBusy.php	Mon Dec 15 07:03:05 2008 +0100
+++ b/lib/Horde/Kolab/FreeBusy.php	Mon Dec 15 07:05:23 2008 +0100
@@ -294,7 +294,7 @@
             if ($access->user == 'manager') {
                 $imapc = &Horde_Kolab_IMAP::singleton($GLOBALS['conf']['kolab']['imap']['server'],
                                                       $GLOBALS['conf']['kolab']['imap']['port']);
-                $result = $imapc->connect($access->user, $access->_pass);
+                $result = $imapc->connect($access->user, Auth::getCredential('password'));
                 if (is_a($result, 'PEAR_Error')) {
                     $lines[] = sprintf(_("Failed regenerating calendar %s: %s"),
                                        $calendar->name, $result->getMessage());


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ChangeLog	12 Dec 2008 15:07:04 -0000	1.23
+++ ChangeLog	15 Dec 2008 06:14:59 -0000	1.24
@@ -1,3 +1,8 @@
+2008-12-15  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_FreeBusy.spec: kolab/issue3313 (free/busy regeneration as
+	manager broken in 2.2.1-beta1)
+
 2008-12-12  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_FreeBusy.spec: Update to 0.1.2.

Index: Kolab_FreeBusy.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Kolab_FreeBusy.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Kolab_FreeBusy.spec	12 Dec 2008 15:07:04 -0000	1.14
+++ Kolab_FreeBusy.spec	15 Dec 2008 06:14:59 -0000	1.15
@@ -15,7 +15,11 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source0:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+Source1:    package.xml
+
+# List of patches
+Patch0:    kolab_issue3313.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -48,6 +52,8 @@
 
 %prep
 	%setup -n %{V_package}-%{V_version}
+        %patch -p1 -P 0
+        cp %{S:1} .
 
 %build
 
@@ -57,7 +63,7 @@
 
         env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"   \
             PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
-	    %{l_prefix}/bin/pear -d www_dir="%{l_prefix}/var/kolab/www/freebusy" install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{V_version}.tgz
+            %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT package.xml
 	rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
 
         %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                     \