From c32c7b5d7beec661363ad5c571eb2fc725878560 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 27 Apr 2021 14:04:50 +0200 Subject: update to 2.0.13 add dependency on composer/metadata-minifier --- composer.json | 1 + composer.spec | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 981f96a..0ee8df4 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ "require": { "php": "^5.3.2 || ^7.0 || ^8.0", "composer/ca-bundle": "^1.0", + "composer/metadata-minifier": "^1.0", "composer/semver": "^3.0", "composer/spdx-licenses": "^1.2", "composer/xdebug-handler": "^1.1", diff --git a/composer.spec b/composer.spec index 6ec553e..c5b70ed 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 6c12ce263da71641903e399c3ce8ecb08fd375fb +%global gh_commit 986e8b86b7b570632ad0a905c3726c33dd4c0efb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 2.0.0 %global run_version 2.0.0 -%global upstream_version 2.0.12 +%global upstream_version 2.0.13 #global upstream_prever RC2 #global upstream_lower rc2 @@ -59,6 +59,7 @@ BuildRequires: php-cli %if %{with_tests} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) +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) >= 1.1 with php-composer(composer/xdebug-handler) < 2) @@ -69,6 +70,7 @@ BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-com BuildRequires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) %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-handler >= 1.1 @@ -96,6 +98,7 @@ BuildRequires: php-PsrLog >= 1.1 # From composer.json, "require": { # "php": "^5.3.2 || ^7.0", # "composer/ca-bundle": "^1.0", +# "composer/metadata-minifier": "^1.0", # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", # "composer/xdebug-handler": "^1.1", @@ -112,6 +115,7 @@ Requires: php(language) >= 5.3.2 Requires: php-cli %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) +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) >= 1.1 with php-composer(composer/xdebug-handler) < 2) @@ -122,6 +126,7 @@ Requires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-com Requires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) %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-handler >= 1.1 @@ -204,6 +209,7 @@ cat << 'EOF' | tee -a src/Composer/autoload.php '%{_datadir}/php/Seld/PharUtils/autoload.php', '%{_datadir}/php/Composer/CaBundle/autoload.php', '%{_datadir}/php/Composer/Spdx/autoload.php', + '%{_datadir}/php/Composer/MetadataMinifier/autoload.php', '%{_datadir}/php/Composer/Semver3/autoload.php', '%{_datadir}/php/Composer/XdebugHandler/autoload.php', '%{_datadir}/php/Psr/Log/autoload.php', @@ -321,6 +327,10 @@ exit $ret %changelog +* Tue Apr 27 2021 Remi Collet - 2.0.13-1 +- update to 2.0.13 +- add dependency on composer/metadata-minifier + * Thu Apr 1 2021 Remi Collet - 2.0.12-1 - update to 2.0.12 -- cgit