summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-06-14 08:44:02 +0200
committerRemi Collet <remi@remirepo.net>2021-06-14 08:44:02 +0200
commit42738c99d32710b3616c7168e5007c0b06dec95c (patch)
treee2904bbb704f018e8ad2a48549f4b229a5267a83
parentae5a11e3387547c9b5a8643f5be81548cabd05bf (diff)
update to 3.2.1 (no change)HEADmaster
allow netresearch/jsonmapper 4.0
-rw-r--r--composer.json2
-rw-r--r--php-felixfbecker-advanced-json-rpc3.spec14
2 files changed, 10 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 1c154df..c4d5739 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
},
"require": {
"php": "^7.1 || ^8.0",
- "netresearch/jsonmapper": "^1.0 || ^2.0",
+ "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
"phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
},
"require-dev": {
diff --git a/php-felixfbecker-advanced-json-rpc3.spec b/php-felixfbecker-advanced-json-rpc3.spec
index 6bac8b0..b1c5f95 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 06f0b06043c7438959dbdeed8bb3f699a19be22e
+%global gh_commit b5f37dbff9a8ad360ca341f3240dc1c168b45447
%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.2.0
+Version: 3.2.1
Release: 1%{?dist}
Summary: A more advanced JSONRPC implementation
@@ -38,7 +38,7 @@ BuildRequires: php(language) >= 7.1
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) < 4)
+BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.0 with php-composer(netresearch/jsonmapper) < 5)
BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 4.3.4 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.1 || ^8.0",
-# "netresearch/jsonmapper": "^1.0 || ^2.0",
+# "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
# "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
Requires: php(language) >= 7.1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(netresearch/jsonmapper) >= 1.0 with php-composer(netresearch/jsonmapper) < 4)
+Requires: (php-composer(netresearch/jsonmapper) >= 1.0 with php-composer(netresearch/jsonmapper) < 5)
Requires: (php-composer(phpdocumentor/reflection-docblock) >= 4.3.4 with php-composer(phpdocumentor/reflection-docblock) < 6)
%else
Requires: php-netresearch-jsonmapper
@@ -151,6 +151,10 @@ exit $ret
%changelog
+* Mon Jun 14 2021 Remi Collet <remi@remirepo.net> - 3.2.1-1
+- update to 3.2.1 (no change)
+- allow netresearch/jsonmapper 4.0
+
* Mon Jan 11 2021 Remi Collet <remi@remirepo.net> - 3.2.0-1
- update to 3.2.0 (no change)
- raise dependency on PHP 7.1