From 54fa358da0c9b15e0b44424cb30ec42c3f94fe70 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Mar 2022 07:35:10 +0100 Subject: update to 2.3.0RC2 --- composer.spec | 85 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 36 deletions(-) (limited to 'composer.spec') diff --git a/composer.spec b/composer.spec index 78a5c67..c3ba1a7 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%if 0%{?fedora} +%if 0 %bcond_without tests %bcond_without syslib %else @@ -18,21 +18,21 @@ %bcond_with syslib %endif -%global gh_commit 07eccf080ad63d55d95a7c9133506db7d9029264 +%global gh_commit 36dc875e1c6d5ce9411c78aae22b33ac24c86e13 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer %global gh_project composer -%global api_version 2.2.0 +%global api_version 2.3.0 %global run_version 2.2.2 -%global upstream_version 2.2.9 -#global upstream_prever RC1 -#global upstream_lower rc1 +%global upstream_version 2.3.0 +%global upstream_prever RC2 +%global upstream_lower rc2 -%global symfony_prefix php-symfony4 -%global symfony_path %{_datadir}/php/Symfony4 -%global symfony_min 4.4 +%global symfony_prefix php-symfony5 +%global symfony_path %{_datadir}/php/Symfony5 +%global symfony_min 5.4.1 %global _phpunit %{_bindir}/phpunit9 @@ -68,26 +68,26 @@ 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) < 4) +BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0.2 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) +BuildRequires: (php-composer(seld/phar-utils) >= 1.2 with php-composer(seld/phar-utils) < 2) +BuildRequires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 4) 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) -BuildRequires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) +BuildRequires: (php-composer(composer/pcre) >= 2 with php-composer(composer/pcre) < 4) # remirepo:13 %else BuildRequires: php-composer-ca-bundle BuildRequires: php-composer-metadata-minifier BuildRequires: php-composer-semver3 BuildRequires: php-composer-spdx-licenses >= 1.2 -BuildRequires: php-composer-xdebug-handler2 +BuildRequires: php-composer-xdebug-handler2 >= 2.0.2 BuildRequires: php-jsonlint >= 1.4 -BuildRequires: php-seld-phar-utils >= 1.1 +BuildRequires: php-seld-phar-utils >= 1.2 BuildRequires: php-PsrLog >= 1.1 BuildRequires: php-justinrainbow-json-schema5 >= 5.2.11 BuildRequires: php-react-promise >= 2.7 -BuildRequires: php-composer-pcre +BuildRequires: php-composer-pcre3 %endif BuildRequires: %{symfony_prefix}-console >= %{symfony_min} BuildRequires: %{symfony_prefix}-finder >= %{symfony_min} @@ -103,22 +103,24 @@ BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require": { -# "php": "^5.3.2 || ^7.0", +# "php": "^7.2.5 || ^8.0", # "composer/ca-bundle": "^1.0", # "composer/metadata-minifier": "^1.0", # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", -# "composer/xdebug-handler": "^2.0 || ^3.0", +# "composer/xdebug-handler": "^2.0.2 || ^3.0.3", # "justinrainbow/json-schema": "^5.2.11", -# "psr/log": "^1.0 || ^2.0" +# "psr/log": "^1.0 || ^2.0 || ^3.0" # "seld/jsonlint": "~1.4", -# "seld/phar-utils": "^1.0", -# "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", -# "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", -# "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", -# "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", -# "react/promise": "^1.2 || ^2.7", -# "composer/pcre": "^1.0" +# "seld/phar-utils": "^1.2", +# "symfony/console": "^5.4.1 || ^6.0", +# "symfony/filesystem": "^5.4 || ^6.0", +# "symfony/finder": "^5.4 || ^6.0", +# "symfony/process": "^5.4 || ^6.0", +# "react/promise": "^2.8", +# "composer/pcre": "^2 || ^3" +# "symfony/polyfill-php73": "^1.24", +# "symfony/polyfill-php80": "^1.24" Requires: php(language) >= 7.2.5 Requires: php-cli %if %{with syslib} @@ -128,26 +130,26 @@ 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) < 4) +Requires: (php-composer(composer/xdebug-handler) >= 2.0.2 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) +Requires: (php-composer(seld/phar-utils) >= 1.2 with php-composer(seld/phar-utils) < 2) +Requires: (php-composer(psr/log) >= 1.1 with php-composer(psr/log) < 4) 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) -Requires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) +Requires: (php-composer(composer/pcre) >= 2 with php-composer(composer/pcre) < 4) # remirepo:13 %else Requires: php-composer-ca-bundle Requires: php-composer-metadata-minifier Requires: php-composer-semver3 Requires: php-composer-spdx-licenses >= 1.2 -Requires: php-composer-xdebug-handler2 +Requires: php-composer-xdebug-handler2 >= 2.0.2 Requires: php-jsonlint >= 1.4 -Requires: php-seld-phar-utils >= 1.1 +Requires: php-seld-phar-utils >= 1.2 Requires: php-PsrLog >= 1.1 Requires: php-justinrainbow-json-schema5 >= 5.2.11 Requires: php-react-promise >= 2.7 -Requires: php-composer-pcre +Requires: php-composer-pcre3 %endif Requires: %{symfony_prefix}-console >= %{symfony_min} Requires: %{symfony_prefix}-finder >= %{symfony_min} @@ -161,8 +163,8 @@ Requires: ca-certificates # Bundled libraries Provides: bundled(php-composer-ca-bundle) = 1.3.1 Provides: bundled(php-composer-metadata-minifier) = 1.0.0 -Provides: bundled(php-composer-pcre) = 1.0.1 -Provides: bundled(php-composer-semver) = 3.3.0 +Provides: bundled(php-composer-pcre) = 2.0.0 +Provides: bundled(php-composer-semver) = 3.3.1 Provides: bundled(php-composer-spdx-licenses) = 1.5.6 Provides: bundled(php-composer-xdebug-handler) = 3.0.3 Provides: bundled(php-justinrainbow-json-schema) = 5.2.11 @@ -264,8 +266,11 @@ 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/Composer/Pcre/autoload.php', [ + '%{_datadir}/php/Composer/Pcre3/autoload.php', + '%{_datadir}/php/Composer/Pcre2/autoload.php', + ], [ + '%{_datadir}/php/Psr/Log3/autoload.php', '%{_datadir}/php/Psr/Log2/autoload.php', '%{_datadir}/php/Psr/Log/autoload.php', ], @@ -408,6 +413,14 @@ exit $ret %changelog +* Mon Mar 21 2022 Remi Collet - 2.3.0~RC2-1 +- update to 2.3.0RC2 + +* Wed Mar 16 2022 Remi Collet - 2.3.0~RC1-1 +- update to 2.3.0RC1 +- always use bundled libraries + as symfony/* 5.4 and composer/pcre 2 are not available + * Wed Mar 16 2022 Remi Collet - 2.2.9-1 - update to 2.2.9 -- cgit