diff options
| -rw-r--r-- | 0001-drop-ereg-dep-for-php-7-in-Kolab_Format.patch | 25 | ||||
| -rw-r--r-- | php-horde-Horde-Kolab-Format.spec | 13 |
2 files changed, 35 insertions, 3 deletions
diff --git a/0001-drop-ereg-dep-for-php-7-in-Kolab_Format.patch b/0001-drop-ereg-dep-for-php-7-in-Kolab_Format.patch new file mode 100644 index 0000000..fbb41c6 --- /dev/null +++ b/0001-drop-ereg-dep-for-php-7-in-Kolab_Format.patch @@ -0,0 +1,25 @@ +From a7a553fc381400d34e92408f921c58950ba43410 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Mon, 27 Jun 2016 07:14:04 +0200 +Subject: [PATCH] drop ereg dep for php 7 in Kolab_Format + +--- + framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php +index e33e186..cb9a012 100644 +--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php ++++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/Xml/Annotation.php +@@ -59,7 +59,7 @@ class Horde_Kolab_Format_Xml_Annotation extends Horde_Kolab_Format_Xml + + $result = array(); + foreach ($object['annotation'] as $annotation) { +- list($key, $value) = split('#', $annotation, 2); ++ list($key, $value) = explode('#', $annotation, 2); + $result[base64_decode($key)] = base64_decode($value); + } + +-- +2.5.5 + diff --git a/php-horde-Horde-Kolab-Format.spec b/php-horde-Horde-Kolab-Format.spec index 1ff89a1..ee7e478 100644 --- a/php-horde-Horde-Kolab-Format.spec +++ b/php-horde-Horde-Kolab-Format.spec @@ -12,7 +12,7 @@ Name: php-horde-Horde-Kolab-Format Version: 2.0.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A package for reading/writing Kolab data formats Group: Development/Libraries @@ -20,6 +20,8 @@ License: LGPLv2 URL: http://%{pear_channel}/ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz +Patch0: 0001-drop-ereg-dep-for-php-7-in-Kolab_Format.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php(language) >= 5.3.0 @@ -33,10 +35,8 @@ Requires(postun): %{__pear} Requires: php(language) >= 5.3.0 Requires: php-date Requires: php-dom -Requires: php-ereg Requires: php-mbstring Requires: php-pcre -Requires: php-spl Requires: php-pear(PEAR) >= 1.7.0 Requires: php-channel(%{pear_channel}) Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 @@ -60,6 +60,10 @@ This package allows to convert Kolab data objects from XML to data arrays. cd %{pear_name}-%{version} mv ../package.xml %{name}.xml +%patch0 -p3 -b .ereg +sed -e '/Annotation.php/s/md5sum="[^"]*"//' \ + -i %{name}.xml + %build cd %{pear_name}-%{version} @@ -119,6 +123,9 @@ fi %changelog +* Mon Jun 27 2016 Remi Collet <remi@fedoraproject.org> - 2.0.8-2 +- add patch to drop dependency on ereg + * Tue Feb 02 2016 Remi Collet <remi@fedoraproject.org> - 2.0.8-1 - Update to 2.0.8 - PHP 7 compatible version |