diff options
| -rw-r--r-- | php-horde-Horde-Mapi.spec | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/php-horde-Horde-Mapi.spec b/php-horde-Horde-Mapi.spec index 815c5fa..3cb16cd 100644 --- a/php-horde-Horde-Mapi.spec +++ b/php-horde-Horde-Mapi.spec @@ -11,8 +11,8 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Mapi -Version: 1.0.8 -Release: 8%{?dist} +Version: 1.0.9 +Release: 1%{?dist} Summary: MAPI utility library Group: Development/Libraries @@ -32,12 +32,12 @@ BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) # To run unit tests BuildRequires: php-bcmath +%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) +BuildRequires: (php-pear(%{pear_channel}/Horde_Date) >= 2.3.0 with php-pear(%{pear_channel}/Horde_Date) < 3) +%else BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 BuildRequires: php-pear(%{pear_channel}/Horde_Date) >= 2.3.0 -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -BuildRequires: php-pear(Math_BigInteger) -%else -BuildRequires: php-pear(phpseclib.sourceforge.net/Math_BigInteger) %endif Requires(post): %{__pear} @@ -46,15 +46,14 @@ 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_Date) >= 2.3.0 with php-pear(%{pear_channel}/Horde_Date) < 3) +Requires: (php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Exception) < 3) +%else Requires: php-pear(%{pear_channel}/Horde_Date) >= 2.3.0 Requires: php-pear(%{pear_channel}/Horde_Date) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0 -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -Requires: php-pear(Math_BigInteger) -%else -# Use phpseclib version instead of the one from pear -Requires: php-pear(phpseclib.sourceforge.net/Math_BigInteger) %endif # From phpcompatinfo report for version 1.0.0 Requires: php-date @@ -97,10 +96,13 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) +# see https://github.com/horde/Mapi/pull/2 +>Autoload.php + ret=0 for cmd in php php56 php70 php71 php72 php73; do if which $cmd; then - $cmd %{_bindir}/phpunit . || ret=1 + $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1 fi done exit $ret @@ -126,6 +128,12 @@ fi %changelog +* Mon Feb 11 2019 Remi Collet <remi@remirepo.net> - 1.0.9-1 +- update to 1.0.9 +- use range dependencies +- drop dependency on Math_BigInteger +- open https://github.com/horde/Mapi/pull/2 fix for tests + * Fri Jan 4 2019 Remi Collet <remi@remirepo.net> - 1.0.8-8 - cleanup for EL-8 |