From 94c6e3de1adddc1f42bc558c1b7fdb83927139c6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Nov 2019 08:09:13 +0100 Subject: v1.1.2 --- php-horde-Horde-Idna.spec | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/php-horde-Horde-Idna.spec b/php-horde-Horde-Idna.spec index 462833d..9fcb7c2 100644 --- a/php-horde-Horde-Idna.spec +++ b/php-horde-Horde-Idna.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-horde-Horde-Idna # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -18,11 +18,10 @@ %endif Name: php-horde-Horde-Idna -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: IDNA backend normalization package -Group: Development/Libraries License: BSD URL: http://www.horde.org/ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz @@ -34,7 +33,13 @@ BuildRequires: php-channel(%{pear_channel}) BuildRequires: gettext %if %{with_tests} # To run unit tests +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 with php-pear(%{pear_channel}/Horde_Test) < 3) +Requires: (php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Exception) < 3) +Requires: (php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Util) < 3) +%else BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 +%endif BuildRequires: php-intl %endif @@ -44,10 +49,15 @@ Requires(postun): %{__pear} Requires: php(language) >= 5.3.0 Requires: php-pear(PEAR) >= 1.7.0 Requires: php-channel(%{pear_channel}) +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Exception) < 3) +Requires: (php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Util) < 3) +%else Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0 +%endif # optional Requires: php-intl @@ -105,9 +115,9 @@ done | tee ../%{pear_name}.lang 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 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 @@ -132,12 +142,21 @@ fi %{pear_xmldir}/%{name}.xml %{pear_phpdir}/Horde/Idna/ %{pear_phpdir}/Horde/Idna.php -%{pear_testdir}/%{pear_name} +%doc %{pear_testdir}/%{pear_name} %dir %{pear_datadir}/%{pear_name} %dir %{pear_datadir}/%{pear_name}/locale %changelog +* Mon Nov 4 2019 Remi Collet - 1.1.2-1 +- update to 1.1.2 +- drop patch merged upstream + +* Thu Oct 17 2019 Remi Collet - 1.1.1-7 +- add patch for PHP 7.4 from + https://github.com/horde/Idna/pull/1 +- use range dependencies + * Fri Jun 23 2017 Remi Collet - 1.1.1-1 - Update to 1.1.1 -- cgit