diff --git a/.gitignore b/.gitignore index 45e96c4..4f0a7d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-sabre-event5-5.0.3-f5cf802.tgz /php-sabre-event5-5.1.0-d00a175.tgz +/php-sabre-event5-5.1.1-a37c73e.tgz diff --git a/php-sabre-event5.spec b/php-sabre-event5.spec index fc8a168..eb7d473 100644 --- a/php-sabre-event5.spec +++ b/php-sabre-event5.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit d00a17507af0e7544cfe17096372f5d733e3b276 +%global gh_commit a37c73e535ddab02bd892f4bdab4867f9778cbea %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project event @@ -23,8 +23,8 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Lightweight library for event-based programming -Version: 5.1.0 -Release: 2%{?dist} +Version: 5.1.1 +Release: 1%{?dist} URL: http://sabre.io/event License: BSD @@ -37,14 +37,21 @@ BuildRequires: php(language) >= 7.1 BuildRequires: php-spl # From composer.json, "require-dev": { # "friendsofphp/php-cs-fixer": "~2.16.1", -# "phpunit/phpunit" : "^7 || ^8" +# "phpstan/phpstan": "^0.12", +# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0" +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 +%else BuildRequires: phpunit8 +%global phpunit %{_bindir}/phpunit8 +%endif # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require": { -# "php": "^7.1" +# "php": "^7.1|^8.0" Requires: php(language) >= 7.1 # From phpcompatinfo report for version 5.0.2 Requires: php-spl @@ -97,9 +104,10 @@ cp -pr lib %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major} %if %{with_tests} : Run upstream test suite against installed library ret=0 -for cmd in php php72 php73 php74; do - if which $cmd; then - $cmd %{_bindir}/phpunit8 \ +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} \ --bootstrap=%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ --configuration tests/phpunit.xml \ --verbose || ret=1 @@ -112,7 +120,6 @@ exit $ret %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *md %doc composer.json @@ -121,6 +128,10 @@ exit $ret %changelog +* Mon Sep 21 2020 Remi Collet - 5.1.1-1 +- update to 5.1.1 +- switch to phpunit9 + * Tue Jul 28 2020 Fedora Release Engineering - 5.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a22bd65..0a88b19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-event5-5.1.0-d00a175.tgz) = a5a59444c790122f0747d87425c965f25913fb6cdf99af826f61de9b5acee26a29e8faf8661c4614616ea62b44e6ceb45f5fcd5b868ab85c086ab2e13042b0c6 +SHA512 (php-sabre-event5-5.1.1-a37c73e.tgz) = e338bfe421224c008c69af609008ef1ce814c9d07170b7ba70675fb30317213dcfed6d547fe2c9b6713f1cdc65b0e7f02e848d985cbf234b16cfdb8bbf9ad3d6