From 358d437f30581d8689f81fced48fcb993c88f097 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Feb 07 2022 09:02:33 +0000
Subject: v2.2.6


---

diff --git a/composer.spec b/composer.spec
index 879f0e6..a753fa4 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    22c41ef275c7bb64fa28fb2c0871a39666832cb9
+%global gh_commit    ce785a18c0fb472421e52d958bab339247cb0e82
 %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.5
+%global upstream_version 2.2.6
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -38,7 +38,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 # composer and all dependencies are MIT
@@ -58,7 +58,7 @@ Patch1:         %{name}-noxdg.patch
 
 BuildArch:      noarch
 # platform set in makesrc.sh
-BuildRequires:  php(language) >= 7.4
+BuildRequires:  php(language) >= 7.2.5
 BuildRequires:  php-cli
 BuildRequires:  php-json
 %if %{with tests}
@@ -103,7 +103,7 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
 #        "react/promise": "^1.2 || ^2.7",
 #        "composer/pcre": "^1.0"
-Requires:       php(language)                           >= 7.4
+Requires:       php(language)                           >= 7.2.5
 Requires:       php-cli
 %if %{with syslib}
 Requires:       (php-composer(composer/ca-bundle)        >= 1.0    with  php-composer(composer/ca-bundle)        <  2)
@@ -130,28 +130,28 @@ Requires:       ca-certificates
 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.2.7
+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-justinrainbow-json-schema) = 5.2.11
-Provides:       bundled(php-psr-container) = 1.1.2
+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-seld-jsonlint) = 1.8.3
 Provides:       bundled(php-seld-phar-utils) = 1.2.0
-Provides:       bundled(php-symfony-console) = v5.4.2
+Provides:       bundled(php-symfony-console) = v5.4.3
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.0
-Provides:       bundled(php-symfony-filesystem) = v5.4.0
-Provides:       bundled(php-symfony-finder) = v5.4.2
+Provides:       bundled(php-symfony-filesystem) = v5.4.3
+Provides:       bundled(php-symfony-finder) = v5.4.3
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.24.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.24.0
 Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.24.0
 Provides:       bundled(php-symfony-polyfill-mbstring) = v1.24.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.24.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.24.0
-Provides:       bundled(php-symfony-process) = v5.4.2
+Provides:       bundled(php-symfony-process) = v5.4.3
 Provides:       bundled(php-symfony-service-contracts) = v2.5.0
-Provides:       bundled(php-symfony-string) = v5.4.2
+Provides:       bundled(php-symfony-string) = v5.4.3
 %endif
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -332,7 +332,10 @@ rm -rf res
 : Run test suite
 export BUILDROOT=%{buildroot}
 
-FILTER="--filter '^((?!(testIntegration)).)*$'"
+# testSearchWithSpecialChars is online
+# testCreateMap fails on 8.1
+# testOutputIgnoresFormatting use InstalledVersions
+FILTER="--filter '^((?!(testIntegration|testSearchWithSpecialChars|testCreateMap|testOutputIgnoresFormatting)).)*$'"
 
 # Adapt for phunit9
 find tests \
@@ -370,6 +373,9 @@ exit $ret
 
 
 %changelog
+* Sat Feb  5 2022 Remi Collet <remi@remirepo.net> - 2.2.6-1
+- update to 2.2.6
+
 * Tue Jan 25 2022 Remi Collet <remi@remirepo.net> - 2.2.5-2
 - use system libraries on Fedora, bundled libraries on EL
 
diff --git a/makesrc.sh b/makesrc.sh
index 1d89e2e..930ec0b 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -20,7 +20,7 @@ else
 	pushd $PROJECT-$COMMIT
 		git checkout $COMMIT || exit 1
 		cp composer.json ../composer.json
-		composer config platform.php 7.4
+		composer config platform.php 7.2.5
 		rm composer.lock
 		export COMPOSER_VENDOR_DIR=src/Composer/vendor
 		composer install --no-interaction --no-progress --no-dev --optimize-autoloader
diff --git a/sources b/sources
index febbfd2..dc98f1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.5-22c41ef.tgz) = dce37e84638863780975745e09771eaf473561eddd6557f8cd0a0de79e4b78dde6e92a7002287d4fb857d3178a6a17d142df1f9dd4d61dc0258af6cf49717205
+SHA512 (composer-2.2.6-ce785a1.tgz) = e7fd81e9705686dae7f5f3b88a7b4ce3a571314505e7558e739d94432e04c893e20da5a2ee00d89a03e91c2899bdfd2271f615ed62f73297bf89b9a9617fab95