diff options
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-zendframework-zend-json-server.spec | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/composer.json b/composer.json index 485667b..9d99e7b 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,9 @@ "Zend\\Json\\Server\\": "src/" } }, + "conflict": { + "zendframework/zend-stdlib": "<3.2.1" + }, "autoload-dev": { "files": [ "test/TestAsset/FooFunc.php" @@ -45,8 +48,8 @@ }, "extra": { "branch-alias": { - "dev-master": "3.1.x-dev", - "dev-develop": "3.2.x-dev" + "dev-master": "3.2.x-dev", + "dev-develop": "3.3.x-dev" } }, "scripts": { diff --git a/php-zendframework-zend-json-server.spec b/php-zendframework-zend-json-server.spec index 23b095b..74dd66e 100644 --- a/php-zendframework-zend-json-server.spec +++ b/php-zendframework-zend-json-server.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 98b31e114661b2be103c82bd9c593fb027fe2371 +%global gh_commit c87b943237b87fca1f06c5a80389ba42ab69bc8b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-json-server @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 3.1.0 +Version: 3.2.0 Release: 1%{?dist} Summary: Zend Json-Server is a JSON-RPC server implementation @@ -134,7 +134,7 @@ require_once __DIR__ . '/../test/TestAsset/FooFunc.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" php71 php72; do +for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 @@ -147,6 +147,7 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -155,6 +156,9 @@ exit $ret %changelog +* Fri Oct 18 2019 Remi Collet <remi@remirepo.net> - 3.2.0-1 +- update to 3.2.0 (no change) + * Thu Apr 26 2018 Remi Collet <remi@remirepo.net> - 3.1.0-1 - update to 3.1.0 - raise dependency on PHP 5.6 |