php-horde-Horde-Kolab-Storage: fix test suite for php 5.6

2 files changed, 33 insertions, 1 deletions

diff --git a/Horde_Kolab_Storage-php54.patch b/Horde_Kolab_Storage-php54.patch
new file mode 100644
index 0000000..d07e250
--- /dev/null
+++ b/Horde_Kolab_Storage-php54.patch
@@ -0,0 +1,24 @@
+diff -up test/Horde/Kolab/Storage/TestCase.php.old test/Horde/Kolab/Storage/TestCase.php
+--- test/Horde/Kolab/Storage/TestCase.php.old	2014-08-16 18:22:51.556008063 +0200
++++ test/Horde/Kolab/Storage/TestCase.php	2014-08-16 18:25:17.171626554 +0200
+@@ -655,8 +655,13 @@ extends PHPUnit_Framework_TestCase
+ 
+     protected function getDefaultEventData($add = '')
+     {
++        if (version_compare(PHP_VERSION, '5.4.0', 'lt')) {
++            $file = __DIR__ . '/fixtures/event.struct';
++        } else {
++            $file = __DIR__ . '/fixtures/event.struct.php54';
++        }
+         return array(
+-            'structure' => __DIR__ . '/fixtures/event.struct',
++            'structure' => $file,
+             'parts' => array(
+                 '2' => array(
+                     'file' => __DIR__ . '/fixtures/event' . $add . '.xml.qp',
+diff -up test/Horde/Kolab/Storage/fixtures/event.struct.php54.old test/Horde/Kolab/Storage/fixtures/event.struct.php54
+--- test/Horde/Kolab/Storage/fixtures/event.struct.php54.old	2014-08-16 18:23:02.600054958 +0200
++++ test/Horde/Kolab/Storage/fixtures/event.struct.php54	2014-08-16 18:20:31.829414814 +0200
+@@ -0,0 +1 @@
++QzoxNToiSG9yZGVfTWltZV9QYXJ0Ijo5Nzg6e2E6MjA6e2k6MDtpOjE7aToxO3M6OToibXVsdGlwYXJ0IjtpOjI7czo1OiJtaXhlZCI7aTozO3M6NjoiYmluYXJ5IjtpOjQ7YTowOnt9aTo1O3M6MDoiIjtpOjY7czowOiIiO2k6NzthOjA6e31pOjg7YToxOntzOjg6ImJvdW5kYXJ5IjtzOjE0OiI9XzFha21tdDNpaTZ2NCI7fWk6OTthOjI6e2k6MDtDOjE1OiJIb3JkZV9NaW1lX1BhcnQiOjI4Mzp7YToyMDp7aTowO2k6MTtpOjE7czo0OiJ0ZXh0IjtpOjI7czo1OiJwbGFpbiI7aTozO3M6MTY6InF1b3RlZC1wcmludGFibGUiO2k6NDthOjA6e31pOjU7czowOiIiO2k6NjtzOjY6ImlubGluZSI7aTo3O2E6MTp7czo0OiJzaXplIjtzOjM6IjI0OSI7fWk6ODthOjE6e3M6NzoiY2hhcnNldCI7czo1OiJVVEYtOCI7fWk6OTthOjA6e31pOjEwO3M6MToiMSI7aToxMTtzOjE6IgoiO2k6MTI7YTowOnt9aToxMztOO2k6MTQ7aToyNDk7aToxNTtOO2k6MTY7TjtpOjE3O2I6MDtpOjE4O2I6MDtpOjE5O047fX1pOjE7QzoxNToiSG9yZGVfTWltZV9QYXJ0IjozNDE6e2E6MjA6e2k6MDtpOjE7aToxO3M6MTE6ImFwcGxpY2F0aW9uIjtpOjI7czoxNzoieC12bmQua29sYWIuZXZlbnQiO2k6MztzOjE2OiJxdW90ZWQtcHJpbnRhYmxlIjtpOjQ7YTowOnt9aTo1O3M6MDoiIjtpOjY7czoxMDoiYXR0YWNobWVudCI7aTo3O2E6Mjp7czo0OiJzaXplIjtzOjM6IjcwNCI7czo4OiJmaWxlbmFtZSI7czo5OiJrb2xhYi54bWwiO31pOjg7YToxOntzOjQ6Im5hbWUiO3M6OToia29sYWIueG1sIjt9aTo5O2E6MDp7fWk6MTA7czoxOiIyIjtpOjExO3M6MToiCiI7aToxMjthOjA6e31pOjEzO047aToxNDtpOjcwNDtpOjE1O047aToxNjtOO2k6MTc7YjowO2k6MTg7YjowO2k6MTk7Tjt9fX1pOjEwO3M6MToiMCI7aToxMTtzOjE6IgoiO2k6MTI7YTowOnt9aToxMztzOjI1OiI9X2NmZUdTcnZnamhsTlloWkhsVlFrbXlBIjtpOjE0O047aToxNTtOO2k6MTY7TjtpOjE3O2I6MDtpOjE4O2I6MDtpOjE5O047fX0=
+\ No newline at end of file
diff --git a/php-horde-Horde-Kolab-Storage.spec b/php-horde-Horde-Kolab-Storage.spec
index 47f0426..c11924d 100644
--- a/php-horde-Horde-Kolab-Storage.spec
+++ b/php-horde-Horde-Kolab-Storage.spec
@@ -12,7 +12,7 @@
 
 Name:           php-horde-Horde-Kolab-Storage
 Version:        2.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A package for handling Kolab data stored on an IMAP server
 
 Group:          Development/Libraries
@@ -20,6 +20,8 @@ License:        LGPLv2
 URL:            http://%{pear_channel}
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
+Patch0:         %{pear_name}-php54.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  gettext
@@ -77,11 +79,14 @@ to deal with this type of data storage effectively.
 %setup -q -c
 cd %{pear_name}-%{version}
 
+%patch0 -p0 -b .php54
+
 # 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 '/TestCase.php/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 
 
@@ -162,6 +167,9 @@ fi
 
 
 %changelog
+* Sat Aug 16 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-2
+- fix test suite for PHP 5.6
+
 * Fri Apr 04 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
 - Update to 2.1.0