diff --git a/.gitignore b/.gitignore index 5031d67..0d5ddd0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /php-zendframework-zend-modulemanager-2.8.0-c2c5b52.tgz /php-zendframework-zend-modulemanager-2.8.1-710c133.tgz /php-zendframework-zend-modulemanager-2.8.2-394df6e.tgz +/php-zendframework-zend-modulemanager-2.8.3-aaba206.tgz diff --git a/php-zendframework-zend-modulemanager.spec b/php-zendframework-zend-modulemanager.spec index 4360c06..f863097 100644 --- a/php-zendframework-zend-modulemanager.spec +++ b/php-zendframework-zend-modulemanager.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 394df6e12248ac430a312d4693f793ee7120baa6 +%global gh_commit aaba206a955b5f43f29e17d09d19fc342a989b24 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-modulemanager @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.8.2 -Release: 6%{?dist} +Version: 2.8.3 +Release: 2%{?dist} Summary: Zend Framework %{library} component License: BSD @@ -43,7 +43,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.1 with ph # "zendframework/zend-loader": "^2.5", # "zendframework/zend-mvc": "^3.0 || ^2.7", # "zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5", -# "phpunit/phpunit": "^6.0.8 || ^5.7.15", +# "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16", # "zendframework/zend-coding-standard": "~1.0.0" BuildRequires: (php-composer(%{gh_owner}/zend-console) >= 2.6 with php-composer(%{gh_owner}/zend-console) < 3) BuildRequires: (php-composer(%{gh_owner}/zend-di) >= 2.6 with php-composer(%{gh_owner}/zend-di) < 3) @@ -51,7 +51,7 @@ BuildRequires: (php-composer(%{gh_owner}/zend-loader) >= 2.5 with ph # ignore max version, test suite pass with 3.1 BuildRequires: php-composer(%{gh_owner}/zend-mvc) >= 2.7 BuildRequires: (php-composer(%{gh_owner}/zend-servicemanager) >= 3.0.3 with php-composer(%{gh_owner}/zend-servicemanager) < 4) -%global phpunit %{_bindir}/phpunit6 +%global phpunit %{_bindir}/phpunit7 BuildRequires: %{phpunit} %endif # Autoloader @@ -156,10 +156,10 @@ require_once __DIR__ . '/../test/TestAsset/ModuleAsClass.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" php70 php71 php72 php73; do +for cmdarg in "php %{phpunit}" php72 php73 php74; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 fi done exit $ret @@ -176,6 +176,10 @@ exit $ret %changelog +* Mon Oct 21 2019 Remi Collet - 2.8.3-2 +- update to 2.8.3 +- switch to phpunit7 + * Thu Feb 28 2019 Remi Collet - 2.8.2-6 - use range dependencies @@ -232,4 +236,4 @@ exit $ret - raise minimum php version to 5.5 * Tue Aug 4 2015 Remi Collet - 2.5.1-1 -- initial package \ No newline at end of file +- initial package diff --git a/sources b/sources index bbbd423..a67faee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-zendframework-zend-modulemanager-2.8.2-394df6e.tgz) = 2bc2d50f99c917ee8218f9a31f98aa9c9f1e5a90c5efeb3339ef6845fa4d276910c5048e4b66eec34e72e9b106d5cd7a5c166f4c8a424ba4abffb42b63479233 +SHA512 (php-zendframework-zend-modulemanager-2.8.3-aaba206.tgz) = 2db41d6fc9d214edc42f10e343a5618afb561a3f7a7c0ac3ac711c50826603df777c3932ecfe17021ba1421178dc1b2a66d5141a2e431658c9427239a12d81af