diff options
Diffstat (limited to 'php-horde-Horde-Kolab-Format.spec')
| -rw-r--r-- | php-horde-Horde-Kolab-Format.spec | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/php-horde-Horde-Kolab-Format.spec b/php-horde-Horde-Kolab-Format.spec index 6412e17..c7b8fa7 100644 --- a/php-horde-Horde-Kolab-Format.spec +++ b/php-horde-Horde-Kolab-Format.spec @@ -11,8 +11,8 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Kolab-Format -Version: 2.0.8 -Release: 2%{?dist} +Version: 2.0.9 +Release: 1%{?dist} Summary: A package for reading/writing Kolab data formats Group: Development/Libraries @@ -20,9 +20,6 @@ License: LGPLv2 URL: http://%{pear_channel}/ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -# https://github.com/horde/horde/pull/195 -Patch0: 0001-drop-ereg-dep-for-php-7-in-Kolab_Format.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php(language) >= 5.3.0 @@ -61,10 +58,6 @@ This package allows to convert Kolab data objects from XML to data arrays. cd %{pear_name}-%{version} mv ../package.xml %{name}.xml -%patch0 -p3 -b .ereg -sed -e '/Annotation.php/s/md5sum="[^"]*"//' \ - -i %{name}.xml - %build cd %{pear_name}-%{version} @@ -91,11 +84,23 @@ sed -e '/VERSION =/s/%{version}/@version@/' \ -i %{pear_name}-%{version}/lib/Horde/Kolab/Format.php cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) -%{_bindir}/phpunit . -if which php70; then - php70 %{_bindir}/phpunit . +# remirepo:11 +run=0 +ret=0 +if which php56; then + php56 %{_bindir}/phpunit . || ret=1 + run=1 +fi +if which php71; then + php71 %{_bindir}/phpunit . || ret=1 + run=1 fi +if [ $run -eq 0 ]; then +%{_bindir}/phpunit --verbose . +# remirepo:2 +fi +exit $ret %clean @@ -124,6 +129,10 @@ fi %changelog +* Sun Jul 03 2016 Remi Collet <remi@fedoraproject.org> - 2.0.9-1 +- Update to 2.0.9 +- drop patch merge upstream + * Mon Jun 27 2016 Remi Collet <remi@fedoraproject.org> - 2.0.8-2 - add patch to drop dependency on ereg |