From 000f1db22d33d3bc8776008c9fa8e5151df40d0e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Jan 2019 13:56:51 +0100 Subject: cleanup for EL-8 --- php-horde-Horde-Util.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/php-horde-Horde-Util.spec b/php-horde-Horde-Util.spec index 8f4706e..385ecee 100644 --- a/php-horde-Horde-Util.spec +++ b/php-horde-Horde-Util.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-horde-Horde-Util # -# Copyright (c) 2012-2017 Nick Bebout, Remi Collet +# Copyright (c) 2012-2019 Nick Bebout, Remi Collet # # License: MIT # https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense @@ -19,7 +19,7 @@ Name: php-horde-Horde-Util Version: 2.5.8 -Release: 4%{?dist} +Release: 8%{?dist} Summary: Horde Utility Libraries Group: Development/Libraries @@ -33,7 +33,7 @@ BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) -%if 0%{?fedora} >= 24 +%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 # Used as default LANG for the test suite BuildRequires: glibc-langpack-fr # Used by some tests @@ -105,11 +105,12 @@ export LANG=fr_FR.utf8 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php56 php70 php71 php72 php73; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose . || ret=1 fi done +exit $ret %else : Test disabled, bootstrap build %endif @@ -140,6 +141,9 @@ fi %changelog +* Fri Jan 4 2019 Remi Collet - 2.5.8-8 +- cleanup for EL-8 + * Tue Dec 19 2017 Remi Collet - 2.5.8-4 - Fix Horde_Mime FTBFS from Koschei, add upstream patch for PHP 7.2 -- cgit