diff options
| author | Remi Collet <fedora@famillecollet.com> | 2017-02-22 14:07:40 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2017-02-22 14:07:40 +0100 |
| commit | c630c16813ef578eca1e3e32a37d3455333988c8 (patch) | |
| tree | ec1e8a5bd58d9e4e6b694e2faf986acd61558f29 | |
| parent | 5f4e711398d2eda89bc5b81e8ca9d18d5e8a1df6 (diff) | |
php-horde-Horde-Kolab-Session: fix FTBFS
| -rw-r--r-- | php-horde-Horde-Kolab-Session.spec | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/php-horde-Horde-Kolab-Session.spec b/php-horde-Horde-Kolab-Session.spec index b968e4b..fae5f79 100644 --- a/php-horde-Horde-Kolab-Session.spec +++ b/php-horde-Horde-Kolab-Session.spec @@ -12,7 +12,7 @@ Name: php-horde-Horde-Kolab-Session Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A package managing an active Kolab session Group: Development/Libraries @@ -20,6 +20,8 @@ License: LGPLv2 URL: http://%{pear_channel}/ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz +Patch0: %{pear_name}-upstream.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php(language) >= 5.3.0 @@ -55,7 +57,9 @@ This package stores Kolab specific user data in the session. %prep %setup -q -c cd %{pear_name}-%{version} -mv ../package.xml %{name}.xml +%patch0 -p3 -b .upstream +sed -e '/role="test"/s/md5sum=.*name=/name=/' \ + ../package.xml >%{name}.xml %build @@ -78,11 +82,26 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) -%{_bindir}/phpunit . - +# remirepo:15 +run=0 +ret=0 +if which php56; then + php56 %{_bindir}/phpunit . || ret=1 + run=1 +fi if which php70; then - php70 %{_bindir}/phpunit . + php70 %{_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 @@ -110,6 +129,9 @@ fi %changelog +* Wed Feb 22 2017 Remi Collet <remi@fedoraproject.org> - 2.0.3-2 +- add upstream fix for tests, fix FTBFS #1424067 + * Tue Feb 02 2016 Remi Collet <remi@fedoraproject.org> - 2.0.3-1 - Update to 2.0.3 - PHP 7 compatible version |