From f0a695f028eeeb10be087b5ce5042e5d83d231ba Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Nov 2019 08:21:36 +0100 Subject: v2.5.9 --- php-horde-Horde-Util.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'php-horde-Horde-Util.spec') diff --git a/php-horde-Horde-Util.spec b/php-horde-Horde-Util.spec index 5021abd..108bf2e 100644 --- a/php-horde-Horde-Util.spec +++ b/php-horde-Horde-Util.spec @@ -18,17 +18,14 @@ %endif Name: php-horde-Horde-Util -Version: 2.5.8 -Release: 12%{?dist} +Version: 2.5.9 +Release: 1%{?dist} Summary: Horde Utility Libraries License: LGPLv2 URL: http://%{pear_channel} Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -Patch0: https://github.com/horde/Util/commit/a8777ae113732dd18f9cf04d825322f596fedac7.patch -Patch1: https://patch-diff.githubusercontent.com/raw/horde/Util/pull/2.patch - BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 @@ -81,9 +78,6 @@ These classes provide functionality useful for all kind of applications. %setup -q -c cd %{pear_name}-%{version} -%patch0 -p1 -b .upstream -%patch1 -p1 -b .pr2 - sed -e 's/md5sum="[^"]*"//' ../package.xml >%{name}.xml @@ -112,7 +106,7 @@ cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) ret=0 for cmd in php php56 php70 php71 php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit --verbose . || ret=1 + $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1 fi done exit $ret @@ -146,6 +140,10 @@ fi %changelog +* Mon Nov 4 2019 Remi Collet - 2.5.9-1 +- update to 2.5.9 +- drop patch merged upstream + * Thu Oct 17 2019 Remi Collet - 2.5.8-12 - another patch for PHP 7.4 from https://github.com/horde/Util/pull/2 -- cgit