gunnar: server/php-kolab/Kolab_Format issue3525.patch, NONE, 1.1.2.1 ChangeLog, 1.3, 1.3.2.1 Kolab_Format.spec, 1.9, 1.9.2.1

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Format
In directory doto:/tmp/cvs-serv2173/php-kolab/Kolab_Format

Modified Files:
      Tag: kolab_2_2_branch
	ChangeLog Kolab_Format.spec 
Added Files:
      Tag: kolab_2_2_branch
	issue3525.patch 
Log Message:
kolab/issue3525 (free/busy regeneration aborts for unparsable events)

--- NEW FILE: issue3525.patch ---
diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php
index 03a5318..0a9859e 100644
--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php
+++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php
@@ -416,6 +416,6 @@ class Horde_Kolab_Format_XML
     function load(&$xmltext)
     {
         $noderoot = $this->_parseXml($xmltext);
-        if ($noderoot === false) {
+        if (empty($noderoot)) {
             return false;
         }

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- ChangeLog	12 Dec 2008 11:48:22 -0000	1.3
+++ ChangeLog	2 Apr 2009 07:29:45 -0000	1.3.2.1
@@ -1,3 +1,8 @@
+2009-04-02  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Format.spec: kolab/issue3525 (free/busy regeneration
+	aborts for unparsable events)
+
 2008-12-12  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Format.spec: Update to 1.0.0.

Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Kolab_Format.spec,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- Kolab_Format.spec	12 Dec 2008 11:48:22 -0000	1.9
+++ Kolab_Format.spec	2 Apr 2009 07:29:45 -0000	1.9.2.1
@@ -1,7 +1,8 @@
 # Variables
 %define         V_package Kolab_Format
 %define         V_version 1.0.0
-%define         V_release 20081212
+%define         V_release 20090402
+%define         V_sourceurl http://pear.horde.org/get
 
 # Package Information
 Name:	   %{V_package}
@@ -14,7 +15,11 @@
 Group:     Development/Libraries
 Distribution:	OpenPKG
 
-Source:    http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+# List of Sources
+Source:    %{V_sourceurl}/%{V_package}-%{V_version}.tgz
+
+# List of patches
+Patch0:    issue3525.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -37,12 +42,16 @@
 %prep
 	%setup -n %{V_package}-%{V_version}
 
+        %patch -p3 -P 0
+
+	cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml
+
 %build
 
 %install
         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 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}