From b9ff70c2ddc88d74208acbaa7066a0c9c6d2e7c0 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 21 Dec 2012 16:40:22 +0100
Subject: php-horde-Horde-Mime: add patch for php 5.5

---
 Horde_Mime_php55.patch    | 13 +++++++++++++
 php-horde-Horde-Mime.spec | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 Horde_Mime_php55.patch

diff --git a/Horde_Mime_php55.patch b/Horde_Mime_php55.patch
new file mode 100644
index 0000000..b423638
--- /dev/null
+++ b/Horde_Mime_php55.patch
@@ -0,0 +1,13 @@
+--- lib/Horde/Mime.php.old	2012-12-21 16:08:45.404417508 +0100
++++ lib/Horde/Mime.php	2012-12-21 16:23:13.987453259 +0100
+@@ -290,8 +290,9 @@
+             switch ($encoding) {
+             case 'Q':
+             case 'q':
++                $callback = function($hex) { return chr(base_convert($hex[1],16,10)); };
+                 $out .= Horde_String::convertCharset(
+-                    preg_replace('/=([0-9a-f]{2})/ie', 'chr(0x\1)', str_replace('_', ' ', $encoded_text)),
++                    preg_replace_callback('/=([0-9a-f]{2})/i', $callback, str_replace('_', ' ', $encoded_text)),
+                     $orig_charset,
+                     'UTF-8'
+                 );
diff --git a/php-horde-Horde-Mime.spec b/php-horde-Horde-Mime.spec
index b0b9b33..eea0620 100644
--- a/php-horde-Horde-Mime.spec
+++ b/php-horde-Horde-Mime.spec
@@ -8,7 +8,7 @@
 
 Name:           php-horde-Horde-Mime
 Version:        2.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Horde MIME Library
 
 Group:          Development/Libraries
@@ -18,6 +18,9 @@ Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 # /usr/lib/rpm/find-lang.sh from fedora 16
 Source1:        find-lang.sh
 
+# http://bugs.horde.org/ticket/11913
+Patch0:         %{pear_name}_php55.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.7.0
@@ -71,11 +74,14 @@ Provides methods for dealing with MIME (RFC 2045) and related e-mail (RFC
 %setup -q -c
 cd %{pear_name}-%{version}
 
+%patch0 -p0 -b .php55
+
 # Don't install .po and .pot files
 # Remove checksum for .mo, as we regenerate them
 sed -e '/%{pear_name}.po/d' \
     -e '/Horde_Other.po/d' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
+    -e '/Mime.php/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 
 
@@ -143,6 +149,12 @@ fi
 
 
 %changelog
+* Fri Dec 21 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.1-2
+- patch for php 5.5
+
+* Wed Nov  7 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.1-1
+- Update to 2.0.1 for remi repo
+
 * Fri Nov  2 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1
 - Update to 2.0.0 for remi repo
 
-- 
cgit