From 04f36f583570ddc9a87a6d8f1d0359ad8b3ca68e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 19 Dec 2017 11:40:00 +0100
Subject: Fix FTBFS from Koschei, add upstream patch for PHP 7.2

---
 php-horde-Horde-Text-Flowed.spec | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'php-horde-Horde-Text-Flowed.spec')

diff --git a/php-horde-Horde-Text-Flowed.spec b/php-horde-Horde-Text-Flowed.spec
index ea53dac..7fc2ea6 100644
--- a/php-horde-Horde-Text-Flowed.spec
+++ b/php-horde-Horde-Text-Flowed.spec
@@ -13,7 +13,7 @@
 
 Name:           php-horde-Horde-Text-Flowed
 Version:        2.0.3
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Horde API for flowed text as per RFC 3676
 
 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
+Patch0:         https://github.com/horde/Text_Flowed/commit/d64eb3a776eb017caa7a504ac4b4d9608bfcf1cc.patch
+
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  php(language) >= 5.3.0
@@ -51,7 +52,9 @@ using the encoding described in RFC 3676 ('flowed' text).
 %setup -q -c
 
 cd %{pear_name}-%{version}
-cp ../package.xml %{name}.xml
+%patch0 -p1 -b .upstream
+
+sed -e 's/md5sum="[^"]*"//' ../package.xml >%{name}.xml
 
 
 %build
@@ -73,11 +76,14 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 %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
@@ -92,14 +98,16 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Text
-%{pear_testdir}/%{pear_name}
+%doc %{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Tue Dec 19 2017 Remi Collet <remi@remirepo.net> - 2.0.3-4
+- Fix FTBFS from Koschei, add upstream patch for PHP 7.2
+
 * Tue Feb 02 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-1
 - Update to 2.0.3
 - PHP 7 compatible version
-- 
cgit