gunnar: server/php-kolab/Kolab_Format Kolab_Format_1.0.1_p1.patch, NONE, 1.1 ChangeLog, 1.4, 1.5 Kolab_Format.spec, 1.10, 1.11

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	ChangeLog Kolab_Format.spec 
Added Files:
	Kolab_Format_1.0.1_p1.patch 
Log Message:
Added backport of upstream patch to fix encoding again. Removed TODO from release notes as the upstream release + the patch includes all fixes also available in the branch.

--- NEW FILE: Kolab_Format_1.0.1_p1.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] Kolab_Format_1.0.1_p1.patch

Removes an additional option that does not help in dealing with XML format
problems but instead breaks encoding again.

https://www.intevation.de/roundup/kolab/issue3528

STATUS: MERGED

http://cvs.horde.org/diff.php/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php?r1=1.15&r2=1.16

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

Index: lib/Horde/Kolab/Format/XML.php
===================================================================
RCS file: /repository/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php,v
retrieving revision 1.5.2.11
retrieving revision 1.5.2.12
diff -u -B -r1.5.2.11 -r1.5.2.12
--- lib/Horde/Kolab/Format/XML.php      2 Apr 2009 20:14:51 -0000       1.5.2.11
+++ lib/Horde/Kolab/Format/XML.php      8 Apr 2009 18:34:39 -0000       1.5.2.12
@@ -597,7 +597,7 @@
     {
         $params = array(
             'xml' => $xmltext,
-            'options' => HORDE_DOM_LOAD_REMOVE_BLANKS | HORDE_DOM_LOAD_RECOVER,
+            'options' => HORDE_DOM_LOAD_REMOVE_BLANKS,
         );
 
         $result = Horde_DOM_Document::factory($params);

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog	2 Apr 2009 20:27:15 -0000	1.4
+++ ChangeLog	24 Apr 2009 06:20:52 -0000	1.5
@@ -1,3 +1,13 @@
+2009-04-24  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Format_1.0.1_p1.patch: Removes an additional option that
+	does not help in dealing with XML format problems but instead
+	breaks encoding again.
+
+	Accept ISO-8859-1 encoding even if advertised as UTF-8
+	kolab/issue3528 (Events with broken encoding should work)
+	https://www.intevation.de/roundup/kolab/issue3528
+
 2009-04-02  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Format.spec: Update to 1.0.1.

Index: Kolab_Format.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Format/Kolab_Format.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Kolab_Format.spec	2 Apr 2009 20:27:15 -0000	1.10
+++ Kolab_Format.spec	24 Apr 2009 06:20:52 -0000	1.11
@@ -1,7 +1,7 @@
 # Variables
 %define         V_package Kolab_Format
 %define         V_version 1.0.1
-%define         V_release 20090402
+%define         V_release 20090424
 %define         V_sourceurl http://pear.horde.org/get
 
 # Package Information
@@ -19,7 +19,7 @@
 Source:    %{V_sourceurl}/%{V_package}-%{V_version}.tgz
 
 # List of patches
-#Patch0:    issueXYZ.patch
+Patch0:    Kolab_Format_1.0.1_p1.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -42,7 +42,7 @@
 %prep
 	%setup -n %{V_package}-%{V_version}
 
-        #%patch -p2 -P 0
+        %patch -p0 -P 0
 
 	cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml