From 702f37b3aba499321aa2ad56b909afd71966f8a1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Feb 2022 12:27:36 +0100 Subject: update to 2.2.7 --- composer.spec | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'composer.spec') diff --git a/composer.spec b/composer.spec index b368277..8e661d9 100644 --- a/composer.spec +++ b/composer.spec @@ -18,7 +18,7 @@ %bcond_with syslib %endif -%global gh_commit ce785a18c0fb472421e52d958bab339247cb0e82 +%global gh_commit 061d154dfdde157cbf453c4695e6af21c0e93903 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -26,7 +26,7 @@ %global api_version 2.2.0 %global run_version 2.2.2 -%global upstream_version 2.2.6 +%global upstream_version 2.2.7 #global upstream_prever RC1 #global upstream_lower rc1 @@ -68,7 +68,7 @@ BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-com BuildRequires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) +BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 4) BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) BuildRequires: (php-composer(seld/phar-utils) >= 1.1 with php-composer(seld/phar-utils) < 2) BuildRequires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) @@ -108,7 +108,7 @@ BuildRequires: php-fedora-autoloader-devel # "composer/metadata-minifier": "^1.0", # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", -# "composer/xdebug-handler": "^2.0", +# "composer/xdebug-handler": "^2.0 || ^3.0", # "justinrainbow/json-schema": "^5.2.11", # "psr/log": "^1.0 || ^2.0" # "seld/jsonlint": "~1.4", @@ -128,7 +128,7 @@ Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-com Requires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) +Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 4) Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) Requires: (php-composer(seld/phar-utils) >= 1.1 with php-composer(seld/phar-utils) < 2) Requires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 3) @@ -164,11 +164,11 @@ Provides: bundled(php-composer-metadata-minifier) = 1.0.0 Provides: bundled(php-composer-pcre) = 1.0.1 Provides: bundled(php-composer-semver) = 3.2.9 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 -Provides: bundled(php-composer-xdebug-handler) = 2.0.4 +Provides: bundled(php-composer-xdebug-handler) = 3.0.2 Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 Provides: bundled(php-psr-container) = 1.1.1 Provides: bundled(php-psr-log) = 1.1.4 -Provides: bundled(php-react-promise) = v2.8.0 +Provides: bundled(php-react-promise) = v2.9.0 Provides: bundled(php-seld-jsonlint) = 1.8.3 Provides: bundled(php-seld-phar-utils) = 1.2.0 Provides: bundled(php-symfony-console) = v5.4.3 @@ -250,7 +250,10 @@ phpab --template fedora --output src/Composer/autoload.php src/Composer cat << 'EOF' | tee -a src/Composer/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', /* before symfony which load composer */ + [ /* before symfony which load composer */ + '%{_datadir}/php/Composer/XdebugHandler3/autoload.php', + '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', + ], '%{symfony_path}/Component/Console/autoload.php', '%{symfony_path}/Component/Finder/autoload.php', '%{symfony_path}/Component/Process/autoload.php', @@ -405,6 +408,9 @@ exit $ret %changelog +* Fri Feb 25 2022 Remi Collet - 2.2.7-1 +- update to 2.2.7 + * Sat Feb 5 2022 Remi Collet - 2.2.6-1 - update to 2.2.6 -- cgit