diff options
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | phan.spec | 22 |
2 files changed, 19 insertions, 6 deletions
diff --git a/composer.json b/composer.json index 293fd65..df1e5d3 100644 --- a/composer.json +++ b/composer.json @@ -24,12 +24,13 @@ "require": { "php": "^7.1.0", "ext-filter": "*", - "ext-tokenizer": "*", "ext-json": "*", + "ext-tokenizer": "*", "composer/semver": "^1.4", "composer/xdebug-handler": "^1.3.2", "felixfbecker/advanced-json-rpc": "^3.0.4", "microsoft/tolerant-php-parser": "0.0.18", + "netresearch/jsonmapper": "^1.6.0", "sabre/event": "^5.0", "symfony/console": "^2.3|^3.0|~4.0", "symfony/polyfill-mbstring": "^1.11.0" @@ -10,14 +10,14 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 0a3e6ab36a16f0f6f2c703d78f6fa62b470a533b +%global gh_commit c1e1c2dfef6e6f5959a84b8fc9cc2849a7b04070 %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 %global with_tests 0%{!?_without_tests:1} -%global upstream_version 2.4.2 +%global upstream_version 2.4.3 #global upstream_prever RC2 Name: %{gh_project} @@ -43,9 +43,10 @@ BuildRequires: (php-composer(composer/semver) >= 1.4 with php- BuildRequires: (php-composer(composer/xdebug-handler) >= 1.3.2 with php-composer(composer/xdebug-handler) < 2) 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.18 with php-composer(microsoft/tolerant-php-parser) < 0.1) +BuildRequires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 2) BuildRequires: (php-composer(sabre/event) >= 5.0 with php-composer(sabre/event) < 6) BuildRequires: (php-composer(symfony/console) >= 2.8 with php-composer(symfony/console) < 5) -# remirepo:13 +# remirepo:15 %else BuildRequires: php-composer(composer/semver) < 2 BuildRequires: php-composer(composer/semver) >= 1.4 @@ -55,6 +56,8 @@ BuildRequires: php-composer(felixfbecker/advanced-json-rpc) < 4 BuildRequires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 BuildRequires: php-composer(microsoft/tolerant-php-parser) < 0.1 BuildRequires: php-composer(microsoft/tolerant-php-parser) >= 0.0.18 +BuildRequires: php-composer(netresearch/jsonmapper) < 2 +BuildRequires: php-composer(netresearch/jsonmapper) >= 1.6 BuildRequires: php-composer(sabre/event) < 6 BuildRequires: php-composer(sabre/event) >= 5.0 BuildRequires: php-composer(symfony/console) < 4 @@ -85,12 +88,13 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": "^7.1.0", # "ext-filter": "*", -# "ext-tokenizer": "*", # "ext-json": "*", +# "ext-tokenizer": "*", # "composer/semver": "^1.4", # "composer/xdebug-handler": "^1.3.2", # "felixfbecker/advanced-json-rpc": "^3.0.4", # "microsoft/tolerant-php-parser": "0.0.18", +# "netresearch/jsonmapper": "^1.6.0", # "sabre/event": "^5.0", # "symfony/console": "^2.3|^3.0|~4.0", # "symfony/polyfill-mbstring": "^1.11.0" @@ -114,9 +118,10 @@ Requires: (php-composer(composer/xdebug-handler) >= 1.3.2 with php- 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.18 with php-composer(microsoft/tolerant-php-parser) < 0.1) +Requires: (php-composer(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 2) Requires: (php-composer(sabre/event) >= 5.0 with php-composer(sabre/event) < 6) Requires: (php-composer(symfony/console) >= 2.8 with php-composer(symfony/console) < 5) -# remirepo:14 +# remirepo:16 %else Requires: php-ast >= 0.1.5 Requires: php-composer(composer/semver) < 2 @@ -127,6 +132,8 @@ Requires: php-composer(felixfbecker/advanced-json-rpc) < 4 Requires: php-composer(felixfbecker/advanced-json-rpc) >= 3.0.4 Requires: php-composer(microsoft/tolerant-php-parser) < 0.1 Requires: php-composer(microsoft/tolerant-php-parser) >= 0.0.18 +Requires: php-composer(netresearch/jsonmapper) < 2 +Requires: php-composer(netresearch/jsonmapper) >= 1.6 Requires: php-composer(sabre/event) < 6 Requires: php-composer(sabre/event) >= 5.0 Requires: php-composer(symfony/console) < 4 @@ -175,6 +182,7 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; '%{_datadir}/php/Composer/XdebugHandler/autoload.php', '%{_datadir}/php/AdvancedJsonRpc3/autoload.php', '%{_datadir}/php/Microsoft/PhpParser/autoload.php', + '%{_datadir}/php/netresearch/jsonmapper/autoload.php', '%{_datadir}/php/Sabre/Event5/autoload.php', [ '%{_datadir}/php/Symfony4/Component/Console/autoload.php', @@ -234,6 +242,10 @@ EOF %changelog +* Thu Nov 21 2019 Remi Collet <remi@remirepo.net> - 2.4.3-1 +- update to 2.4.3 +- add explicit dependency on netresearch/jsonmapper + * Tue Nov 12 2019 Remi Collet <remi@remirepo.net> - 2.4.2-1 - update to 2.4.2 |