summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json2
-rw-r--r--phan.spec44
2 files changed, 25 insertions, 21 deletions
diff --git a/composer.json b/composer.json
index eef7e68..c62fcf2 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
"composer/xdebug-handler": "^1.3.2|^2.0.0",
"felixfbecker/advanced-json-rpc": "^3.0.4",
"microsoft/tolerant-php-parser": "0.0.23",
- "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0",
+ "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0|^4.0",
"sabre/event": "^5.0.3",
"symfony/console": "^3.2|^4.0|^5.0",
"symfony/polyfill-mbstring": "^1.11.0",
diff --git a/phan.spec b/phan.spec
index dca65be..de3cb11 100644
--- a/phan.spec
+++ b/phan.spec
@@ -10,14 +10,14 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 4caaa97195dcea549021cb773a5dc30bb46d1fab
+%global gh_commit 2c9bb22823dd1dcaee62adefa2826db8a9e79302
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner phan
#global gh_date 20150820
%global gh_project phan
%global psr0 Phan
%bcond_without tests
-%global upstream_version 4.0.6
+%global upstream_version 4.0.7
#global upstream_prever RC2
Name: %{gh_project}
@@ -39,14 +39,14 @@ BuildRequires: php(language) >= 7.2
BuildRequires: php-ast >= 1.0.10
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 4)
-BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0.0 with php-composer(composer/xdebug-handler) < 3)
-BuildRequires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 with php-composer(felixfbecker/advanced-json-rpc) < 4)
-BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.23 with php-composer(microsoft/tolerant-php-parser) < 0.1)
-BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 4)
-BuildRequires: (php-composer(sabre/event) >= 5.0.3 with php-composer(sabre/event) < 6)
-BuildRequires: (php-composer(symfony/console) >= 3.2 with php-composer(symfony/console) < 6)
-BuildRequires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2)
+BuildRequires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 4)
+BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0.0 with php-composer(composer/xdebug-handler) < 3)
+BuildRequires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 with php-composer(felixfbecker/advanced-json-rpc) < 4)
+BuildRequires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.23 with php-composer(microsoft/tolerant-php-parser) < 0.1)
+BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 5)
+BuildRequires: (php-composer(sabre/event) >= 5.0.3 with php-composer(sabre/event) < 6)
+BuildRequires: (php-composer(symfony/console) >= 3.2 with php-composer(symfony/console) < 6)
+BuildRequires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2)
# remirepo:13
%else
BuildRequires: php-composer(composer/semver) < 4
@@ -92,7 +92,7 @@ BuildRequires: php-composer(fedora/autoloader)
# "composer/xdebug-handler": "^1.3.2|^2.0.0",
# "felixfbecker/advanced-json-rpc": "^3.0.4",
# "microsoft/tolerant-php-parser": "0.0.23",
-# "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0",
+# "netresearch/jsonmapper": "^1.6.0|^2.0|^3.0|^4.0",
# "sabre/event": "^5.0.3",
# "symfony/console": "^3.2|^4.0|^5.",
# "symfony/polyfill-mbstring": "^1.11.0",
@@ -112,15 +112,15 @@ Requires: php-json
Recommends: php-ast >= 1.0.10
Suggests: php-igbinary
Suggests: php-iconv
-Requires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 4)
-Requires: (php-composer(composer/xdebug-handler) >= 2.0.0 with php-composer(composer/xdebug-handler) < 3)
-Requires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 with php-composer(felixfbecker/advanced-json-rpc) < 4)
-Requires: (php-composer(nikic/php-parser) >= 3.1.1 with php-composer(nikic/php-parser) < 4)
-Requires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.23 with php-composer(microsoft/tolerant-php-parser) < 0.1)
-Requires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 4)
-Requires: (php-composer(sabre/event) >= 5.0.3 with php-composer(sabre/event) < 6)
-Requires: (php-composer(symfony/console) >= 3.2 with php-composer(symfony/console) < 6)
-Requires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2)
+Requires: (php-composer(composer/semver) >= 1.4 with php-composer(composer/semver) < 4)
+Requires: (php-composer(composer/xdebug-handler) >= 2.0.0 with php-composer(composer/xdebug-handler) < 3)
+Requires: (php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 with php-composer(felixfbecker/advanced-json-rpc) < 4)
+Requires: (php-composer(nikic/php-parser) >= 3.1.1 with php-composer(nikic/php-parser) < 4)
+Requires: (php-composer(microsoft/tolerant-php-parser) >= 0.0.23 with php-composer(microsoft/tolerant-php-parser) < 0.1)
+Requires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 5)
+Requires: (php-composer(sabre/event) >= 5.0.3 with php-composer(sabre/event) < 6)
+Requires: (php-composer(symfony/console) >= 3.2 with php-composer(symfony/console) < 6)
+Requires: (php-composer(symfony/polyfill-php80) >= 1.19 with php-composer(symfony/polyfill-php80) < 2)
# remirepo:14
%else
Requires: php-ast >= 1.0.10
@@ -249,6 +249,10 @@ EOF
%changelog
+* Mon Jun 28 2021 Remi Collet <remi@remirepo.net> - 4.0.7-1
+- update to 4.0.7
+- allow netresearch/jsonmapper 4.0
+
* Thu May 20 2021 Remi Collet <remi@remirepo.net> - 4.0.6-1
- update to 4.0.6