diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | composer.spec | 19 |
2 files changed, 15 insertions, 8 deletions
diff --git a/composer.json b/composer.json index 9225f2e..a13c6b5 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "composer/spdx-licenses": "^1.2", "composer/xdebug-handler": "^2.0", "justinrainbow/json-schema": "^5.2.11", - "psr/log": "^1.0", + "psr/log": "^1.0 || ^2.0", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.0", "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", @@ -55,7 +55,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-main": "2.1-dev" } }, "autoload": { diff --git a/composer.spec b/composer.spec index 66e1726..78e89b8 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit e558c88f28d102d497adec4852802c0dc14c7077 +%global gh_commit ea5f64d1a15c66942979b804c9fb3686be852ca0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 2.1.0 %global run_version 2.1.0 -%global upstream_version 2.1.9 +%global upstream_version 2.1.10 #global upstream_prever RC1 #global upstream_lower rc1 @@ -61,7 +61,7 @@ BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-com BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) BuildRequires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) # remirepo:12 @@ -100,7 +100,7 @@ BuildRequires: php-PsrLog >= 1.1 # "composer/spdx-licenses": "^1.2", # "composer/xdebug-handler": "^2.0", # "justinrainbow/json-schema": "^5.2.11", -# "psr/log": "^1.0" +# "psr/log": "^1.0 || ^2.0" # "seld/jsonlint": "~1.4", # "seld/phar-utils": "^1.0", # "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", @@ -119,7 +119,7 @@ Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-com Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) Requires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) Requires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) # remirepo:12 @@ -212,7 +212,10 @@ cat << 'EOF' | tee -a src/Composer/autoload.php '%{_datadir}/php/Composer/Spdx/autoload.php', '%{_datadir}/php/Composer/MetadataMinifier/autoload.php', '%{_datadir}/php/Composer/Semver3/autoload.php', - '%{_datadir}/php/Psr/Log/autoload.php', + [ + '%{_datadir}/php/Psr/Log2/autoload.php', + '%{_datadir}/php/Psr/Log/autoload.php', + ], '%{_datadir}/php/JsonSchema5/autoload.php', '%{_datadir}/php/React/Promise/autoload.php', ]); @@ -327,6 +330,10 @@ exit $ret %changelog +* Sat Oct 30 2021 Remi Collet <remi@remirepo.net> - 2.1.10-1 +- update to 2.1.10 +- allow psr/log v2 + * Tue Oct 5 2021 Remi Collet <remi@remirepo.net> - 2.1.9-1 - update to 2.1.9 |