summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-03-14 15:56:22 +0100
committerRemi Collet <remi@remirepo.net>2020-03-14 15:56:22 +0100
commit868ad73f1f0b4db80fdb98c574df74356e72f90b (patch)
tree2dc992722f4467cdd794316830b1dbc001e88b51
parent6de9da64dde6ee6ce0d969220521cbdda0c182da (diff)
update to 2.6.1
allow netresearch/jsonmapper 2.0
-rw-r--r--composer.json2
-rw-r--r--phan.spec18
2 files changed, 12 insertions, 8 deletions
diff --git a/composer.json b/composer.json
index f8dc089..92817ee 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
"composer/xdebug-handler": "^1.3.2",
"felixfbecker/advanced-json-rpc": "^3.0.4",
"microsoft/tolerant-php-parser": "0.0.20",
- "netresearch/jsonmapper": "^1.6.0",
+ "netresearch/jsonmapper": "^1.6.0|^2.0",
"sabre/event": "^5.0",
"symfony/console": "^2.3|^3.0|^4.0|^5.0",
"symfony/polyfill-mbstring": "^1.11.0"
diff --git a/phan.spec b/phan.spec
index 9e042e8..36867ba 100644
--- a/phan.spec
+++ b/phan.spec
@@ -10,14 +10,14 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit d082d19370ff87e6036073eaccda7c06ddc3f53e
+%global gh_commit 184c591e5b31c1f98426ed8e147a61864bd0cc96
%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.6.0
+%global upstream_version 2.6.1
#global upstream_prever RC2
Name: %{gh_project}
@@ -43,7 +43,7 @@ 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.20 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(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 3)
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) < 6)
# remirepo:15
@@ -56,7 +56,7 @@ 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) < 3
BuildRequires: php-composer(netresearch/jsonmapper) >= 1.6
BuildRequires: php-composer(sabre/event) < 6
BuildRequires: php-composer(sabre/event) >= 5.0
@@ -94,7 +94,7 @@ BuildRequires: php-composer(fedora/autoloader)
# "composer/xdebug-handler": "^1.3.2",
# "felixfbecker/advanced-json-rpc": "^3.0.4",
# "microsoft/tolerant-php-parser": "0.0.20",
-# "netresearch/jsonmapper": "^1.6.0",
+# "netresearch/jsonmapper": "^1.6.0|^2.0",
# "sabre/event": "^5.0",
# "symfony/console": "^2.3|^3.0|~4.0|^5.0",
# "symfony/polyfill-mbstring": "^1.11.0"
@@ -118,7 +118,7 @@ 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.20 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(netresearch/jsonmapper) >= 1.6 with php-composer(netresearch/jsonmapper) < 3)
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) < 6)
# remirepo:16
@@ -132,7 +132,7 @@ 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) < 3
Requires: php-composer(netresearch/jsonmapper) >= 1.6
Requires: php-composer(sabre/event) < 6
Requires: php-composer(sabre/event) >= 5.0
@@ -243,6 +243,10 @@ EOF
%changelog
+* Sat Mar 14 2020 Remi Collet <remi@remirepo.net> - 2.6.1-1
+- update to 2.6.1
+- allow netresearch/jsonmapper 2.0
+
* Mon Mar 9 2020 Remi Collet <remi@remirepo.net> - 2.6.0-1
- update to 2.6.0
- raise dependency on microsoft/tolerant-php-parser 0.0.20