From 097452557cff42f854716478de470fe2ce70b967 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 12 Oct 2017 18:02:29 +0200
Subject: add upstream patch for PHP 7.2, FTBFS from Koschei

---
 php-horde-Horde-Data.spec | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'php-horde-Horde-Data.spec')

diff --git a/php-horde-Horde-Data.spec b/php-horde-Horde-Data.spec
index 10d3449..bb73b54 100644
--- a/php-horde-Horde-Data.spec
+++ b/php-horde-Horde-Data.spec
@@ -13,7 +13,7 @@
 
 Name:           php-horde-Horde-Data
 Version:        2.1.4
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Horde Data API
 
 Group:          Development/Libraries
@@ -21,7 +21,8 @@ License:        LGPLv2
 URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         https://github.com/horde/Data/commit/78ad0c2390176cdde7260a271bc6ddd86f4c9c0e.patch
+
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
@@ -69,11 +70,13 @@ A data import and export API, with backends for:
 %prep
 %setup -q -c
 cd %{pear_name}-%{version}
+%patch0 -p1 -b .upstream
 
 # Don't install .po and .pot files
 # Remove checksum for .mo, as we regenerate them
 sed -e '/%{pear_name}.po/d' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
+    -e '/Csv.php/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 touch -r ../package.xml %{name}.xml
 
@@ -108,11 +111,14 @@ done | tee ../%{pear_name}.lang
 
 %check
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-%{_bindir}/phpunit .
 
-if which php70; then
-   php70 %{_bindir}/phpunit .
-fi
+ret=0
+for cmd in php php56 php70 php71 php72; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit --verbose . || ret=1
+  fi
+done
+exit $ret
 
 
 %post
@@ -127,17 +133,19 @@ fi
 
 
 %files -f %{pear_name}.lang
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Data
 %{pear_phpdir}/Horde/Data.php
-%{pear_testdir}/%{pear_name}
+%doc %{pear_testdir}/%{pear_name}
 %dir %{pear_datadir}/%{pear_name}
 %dir %{pear_datadir}/%{pear_name}/locale
 
 
 %changelog
+* Thu Oct 12 2017 Remi Collet <remi@remirepo.net> - 2.1.4-1
+- add upstream patch for PHP 7.2, FTBFS from Koschei
+
 * Tue Feb 02 2016 Remi Collet <remi@fedoraproject.org> - 2.1.4-1
 - Update to 2.1.4
 - PHP 7 compatible version
-- 
cgit