php-horde-Horde-Kolab-Format: 2.0.9

2 files changed, 21 insertions, 37 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
deleted file mode 100644
index fbb41c6..0000000
--- a/0001-drop-ereg-dep-for-php-7-in-Kolab_Format.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 6412e17..c7b8fa7 100644
--- a/php-horde-Horde-Kolab-Format.spec
+++ b/php-horde-Horde-Kolab-Format.spec
@@ -11,8 +11,8 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Kolab-Format
-Version:        2.0.8
-Release:        2%{?dist}
+Version:        2.0.9
+Release:        1%{?dist}
 Summary:        A package for reading/writing Kolab data formats
 
 Group:          Development/Libraries
@@ -20,9 +20,6 @@ License:        LGPLv2
 URL:            http://%{pear_channel}/
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-# https://github.com/horde/horde/pull/195
-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
@@ -61,10 +58,6 @@ 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}
@@ -91,11 +84,23 @@ sed -e '/VERSION =/s/%{version}/@version@/' \
     -i %{pear_name}-%{version}/lib/Horde/Kolab/Format.php
 
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-%{_bindir}/phpunit .
 
-if which php70; then
-   php70 %{_bindir}/phpunit .
+# remirepo:11
+run=0
+ret=0
+if which php56; then
+   php56 %{_bindir}/phpunit . || ret=1
+   run=1
+fi
+if which php71; then
+   php71 %{_bindir}/phpunit . || ret=1
+   run=1
 fi
+if [ $run -eq 0 ]; then
+%{_bindir}/phpunit --verbose .
+# remirepo:2
+fi
+exit $ret
 
 
 %clean
@@ -124,6 +129,10 @@ fi
 
 
 %changelog
+* Sun Jul 03 2016 Remi Collet <remi@fedoraproject.org> - 2.0.9-1
+- Update to 2.0.9
+- drop patch merge upstream
+
 * Mon Jun 27 2016 Remi Collet <remi@fedoraproject.org> - 2.0.8-2
 - add patch to drop dependency on ereg