diff options
| author | Remi Collet <remi@remirepo.net> | 2017-11-09 13:19:28 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-11-09 13:19:28 +0100 |
| commit | 8230106f815c9460d4f1c5d77218eb776515ae52 (patch) | |
| tree | aaccd5bb9b60d1260ae60372d0c7853ed31420d0 | |
| parent | d991b2cf463ced4ae84a8a03d125eea96656bca7 (diff) | |
fix FTBFS from Koschei, ignore 1 test with PHP 7.2
| -rw-r--r-- | php-horde-Horde-SessionHandler.spec | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/php-horde-Horde-SessionHandler.spec b/php-horde-Horde-SessionHandler.spec index fe1d227..5fca9ab 100644 --- a/php-horde-Horde-SessionHandler.spec +++ b/php-horde-Horde-SessionHandler.spec @@ -12,7 +12,7 @@ Name: php-horde-Horde-SessionHandler Version: 2.2.9 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Horde Session Handler API Group: Development/Libraries @@ -20,7 +20,6 @@ License: LGPLv2 URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) @@ -67,7 +66,6 @@ cd %{pear_name}-%{version} %install cd %{pear_name}-%{version} -rm -rf %{buildroot} %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Clean up unnecessary files @@ -78,28 +76,20 @@ mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} -%clean -rm -rf %{buildroot} %check cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) -# 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 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + if [ $($cmd -r 'echo PHP_VERSION_ID;') -ge 70200 ]; then + rm Storage/BuiltinTest.php + fi + $cmd %{_bindir}/phpunit --verbose . || ret=1 + fi +done exit $ret @@ -115,16 +105,18 @@ fi %files -%defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %{pear_xmldir}/%{name}.xml %{pear_phpdir}/Horde/SessionHandler %{pear_phpdir}/Horde/SessionHandler.php %{pear_datadir}/%{pear_name} -%{pear_testdir}/%{pear_name} +%doc %{pear_testdir}/%{pear_name} %changelog +* Thu Nov 9 2017 Remi Collet <remi@remirepo.net> - 2.2.9-3 +- fix FTBFS from Koschei, ignore 1 test with PHP 7.2 + * Mon Feb 27 2017 Remi Collet <remi@fedoraproject.org> - 2.2.9-1 - Update to 2.2.9 |