summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json2
-rw-r--r--php-felixfbecker-advanced-json-rpc3.spec19
2 files changed, 14 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index 462ac4e..8baec76 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
"require": {
"php": ">=7.0",
"netresearch/jsonmapper": "^1.0",
- "phpdocumentor/reflection-docblock": "^4.0.0"
+ "phpdocumentor/reflection-docblock": "^4.0.0 || ^5.0.0"
},
"require-dev": {
"phpunit/phpunit": "^6.0.0"
diff --git a/php-felixfbecker-advanced-json-rpc3.spec b/php-felixfbecker-advanced-json-rpc3.spec
index 4e74f01..2e58bac 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 23366dd0cab0a0f3fd3016bf3c0b36dec74348e7
+%global gh_commit a407a6cb0325cd489c6dff57afcba6baeccc0483
%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.0.4
+Version: 3.1.0
Release: 1%{?dist}
Summary: A more advanced JSONRPC implementation
@@ -39,7 +39,7 @@ 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(phpdocumentor/reflection-docblock) >= 4.0 with php-composer(phpdocumentor/reflection-docblock) < 5)
+BuildRequires: (php-composer(phpdocumentor/reflection-docblock) >= 4.0 with php-composer(phpdocumentor/reflection-docblock) < 6)
%else
BuildRequires: php-netresearch-jsonmapper
BuildRequires: php-phpdocumentor-reflection-docblock4
@@ -54,11 +54,11 @@ BuildRequires: php-composer(fedora/autoloader)
# From composer.json, "require": {
# "php": ">=7.0",
# "netresearch/jsonmapper": "^1.0",
-# "phpdocumentor/reflection-docblock": "^3.1"
+# "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(phpdocumentor/reflection-docblock) >= 4.0 with php-composer(phpdocumentor/reflection-docblock) < 5)
+Requires: (php-composer(phpdocumentor/reflection-docblock) >= 4.0 with php-composer(phpdocumentor/reflection-docblock) < 6)
%else
Requires: php-netresearch-jsonmapper
Requires: php-phpdocumentor-reflection-docblock4
@@ -99,7 +99,10 @@ cat << 'EOF' | tee lib/autoload.php
require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('%{ns_project}\\', __DIR__);
\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/phpDocumentor/Reflection/DocBlock4/autoload.php',
+ [
+ '%{php_home}/phpDocumentor/Reflection/DocBlock5/autoload.php',
+ '%{php_home}/phpDocumentor/Reflection/DocBlock4/autoload.php',
+ ],
'%{php_home}/netresearch/jsonmapper/autoload.php',
]);
EOF
@@ -144,6 +147,10 @@ exit $ret
%changelog
+* 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
+
* Fri Sep 13 2019 Remi Collet <remi@remirepo.net> - 3.0.4-1
- update to 3.0.4