diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-felixfbecker-advanced-json-rpc3.spec | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/composer.json b/composer.json index 8baec76..a7e1d7b 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "require": { "php": ">=7.0", - "netresearch/jsonmapper": "^1.0", + "netresearch/jsonmapper": "^1.0 || ^2.0", "phpdocumentor/reflection-docblock": "^4.0.0 || ^5.0.0" }, "require-dev": { diff --git a/php-felixfbecker-advanced-json-rpc3.spec b/php-felixfbecker-advanced-json-rpc3.spec index 5aa0367..e3befcf 100644 --- a/php-felixfbecker-advanced-json-rpc3.spec +++ b/php-felixfbecker-advanced-json-rpc3.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit a407a6cb0325cd489c6dff57afcba6baeccc0483 +%global gh_commit 0ed363f8de17d284d479ec813c9ad3f6834b5c40 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner felixfbecker %global gh_project php-advanced-json-rpc @@ -21,7 +21,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.1.0 +Version: 3.1.1 Release: 1%{?dist} Summary: A more advanced JSONRPC implementation @@ -38,7 +38,7 @@ BuildRequires: php(language) >= 7.0 BuildRequires: php-reflection BuildRequires: php-json %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.0 with php-composer(netresearch/jsonmapper) < 2) +BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.0 with php-composer(netresearch/jsonmapper) < 3) BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 4.0 with php-composer(phpdocumentor/reflection-docblock) < 6) %else BuildRequires: php-netresearch-jsonmapper @@ -53,11 +53,11 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": ">=7.0", -# "netresearch/jsonmapper": "^1.0", +# "netresearch/jsonmapper": "^1.0 || ^2.0", # "phpdocumentor/reflection-docblock": "^4.0.0 || ^5.0.0" Requires: php(language) >= 7.0 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(netresearch/jsonmapper) >= 1.0 with php-composer(netresearch/jsonmapper) < 2) +Requires: (php-composer(netresearch/jsonmapper) >= 1.0 with php-composer(netresearch/jsonmapper) < 3) Requires: (php-composer(phpdocumentor/reflection-docblock) >= 4.0 with php-composer(phpdocumentor/reflection-docblock) < 6) %else Requires: php-netresearch-jsonmapper @@ -147,6 +147,10 @@ exit $ret %changelog +* Sat Mar 14 2020 Remi Collet <remi@remirepo.net> - 3.1.1-1 +- update to 3.1.1 (no change) +- allow netresearch/jsonmapper 2.0 + * Wed Feb 12 2020 Remi Collet <remi@remirepo.net> - 3.1.0-1 - update to 3.1.0 (no change) - allow phpdocumentor/reflection-docblock v5 |