From 7eae3d919d50449b5a5b015817cdb18972e9bb6f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 14 Oct 2015 16:08:05 +0200
Subject: [PATCH 001/269] new snapshot, use autoloader from all dependencies

---
 .gitignore            |  1 +
 composer-autoload.php |  6 +++---
 composer.spec         | 29 ++++++++++++++++++++++-------
 sources               |  2 +-
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 10b886e..d0a588a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clog
 /composer-1.0.0-c83650f.tar.gz
 /composer-1.0.0-9f6fdfd.tar.gz
 /composer-1.0.0-7a9eb02.tar.gz
+/composer-1.0.0-a54f84f.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index d5a4646..71f153e 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -11,15 +11,15 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo
 }
 
 $fedoraClassLoader->addPrefixes(array(
-    'Seld\\JsonLint\\'             => $vendorDir,
-    'Seld\\PharUtils\\'            => $vendorDir,
-    'Seld\\CliPrompt\\'            => $vendorDir,
     'Symfony\\Component\\'         => $vendorDir,
     'Composer\\'                   => dirname(__DIR__)
 ));
 $fedoraClassLoader->register();
 
 // Dependencies
+require_once $vendorDir . '/Seld/JsonLint/autoload.php';
+require_once $vendorDir . '/Seld/PharUtils/autoload.php';
+require_once $vendorDir . '/Seld/CliPrompt/autoload.php';
 require_once $vendorDir . '/Composer/Spdx/autoload.php';
 require_once $vendorDir . '/Composer/Semver/autoload.php';
 require_once $vendorDir . '/JsonSchema/autoload.php';
diff --git a/composer.spec b/composer.spec
index 0244820..8accd78 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,10 +6,10 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    7a9eb02190d334513e99a479510f87eed18cf958
+%global gh_commit    a54f84f05f915c6d42bed94de0cdcb4406a4707b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
-%global gh_date      20151007
+%global gh_date      20151013
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.0.0
-Release:        0.12.%{gh_date}git%{gh_short}%{?dist}
+Release:        0.13.%{gh_date}git%{gh_short}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -37,16 +37,25 @@ BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.4.4
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
 BuildRequires:  php-composer(seld/jsonlint)             >= 1.0
+BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
+BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(symfony/console)           >= 2.5
 BuildRequires:  php-composer(symfony/finder)            >= 2.2
 BuildRequires:  php-composer(symfony/filesystem)        >= 2.5
 BuildRequires:  php-composer(symfony/process)           >= 2.1
-BuildRequires:  php-composer(symfony/class-loader)
-BuildRequires:  %{_bindir}/phpunit
 BuildRequires:  php-zip
+# From composer.json, "require-dev": {
+#        "phpunit/phpunit": "~4.5|^5.0.5",
+#        "phpunit/phpunit-mock-objects": "2.3.0|~3.0"
+BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
+# For autoloader
+BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  php-seld-phar-utils >= 1.0.1
+BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
+BuildRequires:  php-jsonlint        >= 1.3.1-3
 %endif
 
-# From composer.json, requires
+# From composer.json, "require": {
 #        "php": ">=5.3.2",
 #        "justinrainbow/json-schema": "^1.4.4",
 #        "composer/spdx-licenses": "^1.0",
@@ -87,6 +96,9 @@ Requires:       php-zip
 Requires:       php-openssl
 # For our autoloader
 Requires:       php-composer(symfony/class-loader)
+Requires:       php-seld-phar-utils >= 1.0.1
+Requires:       php-seld-cli-prompt >= 1.0.0-3
+Requires:       php-jsonlint        >= 1.3.1-3
 # From phpcompatinfo
 Requires:       php-curl
 Requires:       php-date
@@ -188,6 +200,10 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Wed Oct 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.13.20151013gita54f84f
+- new snapshot
+- use autoloader from all dependencies
+
 * Sun Oct 11 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.12.20151007git7a9eb02
 - new snapshot
 - provide php-composer(composer-plugin-api)
@@ -195,7 +211,6 @@ export BUILDROOT=%{buildroot}
 - add dependency on composer/semver
 - add dependency on symfony/filesystem
 
-
 * Tue Sep  8 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.9.20150907git9f6fdfd
 - new snapshot
 - add LICENSE in application data, as used by the code
diff --git a/sources b/sources
index 4a0463f..41744b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5ae42eaebfcf4b405247d3ec77e46b3  composer-1.0.0-7a9eb02.tar.gz
+584f4479e35bbfd4e9cb409879e8cbff  composer-1.0.0-a54f84f.tar.gz

From 811cb6506c98dd9b6922c72be8b49749ddbe4251 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 2 Nov 2015 08:09:01 +0100
Subject: [PATCH 002/269] 20151030

---
 .gitignore    |  1 +
 composer.spec | 36 ++++++++++++++++++++----------------
 sources       |  2 +-
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index d0a588a..25b6d6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
 /composer-1.0.0-9f6fdfd.tar.gz
 /composer-1.0.0-7a9eb02.tar.gz
 /composer-1.0.0-a54f84f.tar.gz
+/composer-1.0.0-5a5088e.tar.gz
diff --git a/composer.spec b/composer.spec
index 8accd78..b24c136 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,10 +6,10 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    a54f84f05f915c6d42bed94de0cdcb4406a4707b
+%global gh_commit    5a5088eb342e4876cb28472ba1fc3f1da7a14852
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
-%global gh_date      20151013
+%global gh_date      20151030
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.0.0
-Release:        0.13.%{gh_date}git%{gh_short}%{?dist}
+Release:        0.14.%{gh_date}git%{gh_short}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -45,8 +45,8 @@ BuildRequires:  php-composer(symfony/filesystem)        >= 2.5
 BuildRequires:  php-composer(symfony/process)           >= 2.1
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "~4.5|^5.0.5",
-#        "phpunit/phpunit-mock-objects": "2.3.0|~3.0"
+#        "phpunit/phpunit": "^4.5 || ^5.0.5",
+#        "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
 BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
 # For autoloader
 BuildRequires:  php-composer(symfony/class-loader)
@@ -56,17 +56,17 @@ BuildRequires:  php-jsonlint        >= 1.3.1-3
 %endif
 
 # From composer.json, "require": {
-#        "php": ">=5.3.2",
+#        "php": "^5.3.2 || ^7.0",
 #        "justinrainbow/json-schema": "^1.4.4",
 #        "composer/spdx-licenses": "^1.0",
 #        "composer/semver": "^1.0",
 #        "seld/jsonlint": "~1.0",
-#        "symfony/console": "~2.5",
-#        "symfony/finder": "~2.2",
-#        "symfony/process": "~2.1",
-#        "symfony/filesystem": "~2.5",
-#        "seld/phar-utils": "~1.0",
-#        "seld/cli-prompt": "~1.0"
+#        "symfony/console": "^2.5 || ^3.0",
+#        "symfony/finder": "^2.2 || ^3.0",
+#        "symfony/process": "^2.1 || ^3.0",
+#        "symfony/filesystem": "^2.5 || ^3.0",
+#        "seld/phar-utils": "^1.0",
+#        "seld/cli-prompt": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-composer(justinrainbow/json-schema) >= 1.4.4
@@ -82,13 +82,13 @@ Requires:       php-composer(seld/phar-utils)           <  2
 Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(symfony/console)           >= 2.5
-Requires:       php-composer(symfony/console)           <  3
+Requires:       php-composer(symfony/console)           <  4
 Requires:       php-composer(symfony/finder)            >= 2.2
-Requires:       php-composer(symfony/finder)            <  3
+Requires:       php-composer(symfony/finder)            <  4
 Requires:       php-composer(symfony/process)           >= 2.1
-Requires:       php-composer(symfony/process)           <  3
+Requires:       php-composer(symfony/process)           <  4
 Requires:       php-composer(symfony/filesystem)        >= 2.5
-Requires:       php-composer(symfony/filesystem)        <  3
+Requires:       php-composer(symfony/filesystem)        <  4
 # From composer.json, suggest
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages"
@@ -200,6 +200,10 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Mon Nov  2 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.14.20151030git5a5088e
+- new snapshot
+- allow symfony 3
+
 * Wed Oct 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.13.20151013gita54f84f
 - new snapshot
 - use autoloader from all dependencies
diff --git a/sources b/sources
index 41744b6..e1b4a49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-584f4479e35bbfd4e9cb409879e8cbff  composer-1.0.0-a54f84f.tar.gz
+f19601c7374366d9cf44bd31670483c2  composer-1.0.0-5a5088e.tar.gz

From 69d1246e672cacb04918a571e8a3750f26242b54 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 2 Nov 2015 08:26:32 +0100
Subject: [PATCH 003/269] 20151030

(cherry picked from commit 9c70a39249a63a064e3c79004476d095d777b46b)
---
 .gitignore            |  2 ++
 composer-autoload.php |  6 ++---
 composer.spec         | 52 ++++++++++++++++++++++++++++---------------
 sources               |  2 +-
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 10b886e..25b6d6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ clog
 /composer-1.0.0-c83650f.tar.gz
 /composer-1.0.0-9f6fdfd.tar.gz
 /composer-1.0.0-7a9eb02.tar.gz
+/composer-1.0.0-a54f84f.tar.gz
+/composer-1.0.0-5a5088e.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index d5a4646..71f153e 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -11,15 +11,15 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo
 }
 
 $fedoraClassLoader->addPrefixes(array(
-    'Seld\\JsonLint\\'             => $vendorDir,
-    'Seld\\PharUtils\\'            => $vendorDir,
-    'Seld\\CliPrompt\\'            => $vendorDir,
     'Symfony\\Component\\'         => $vendorDir,
     'Composer\\'                   => dirname(__DIR__)
 ));
 $fedoraClassLoader->register();
 
 // Dependencies
+require_once $vendorDir . '/Seld/JsonLint/autoload.php';
+require_once $vendorDir . '/Seld/PharUtils/autoload.php';
+require_once $vendorDir . '/Seld/CliPrompt/autoload.php';
 require_once $vendorDir . '/Composer/Spdx/autoload.php';
 require_once $vendorDir . '/Composer/Semver/autoload.php';
 require_once $vendorDir . '/JsonSchema/autoload.php';
diff --git a/composer.spec b/composer.spec
index 0244820..8c2b419 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,10 +6,10 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    7a9eb02190d334513e99a479510f87eed18cf958
+%global gh_commit    5a5088eb342e4876cb28472ba1fc3f1da7a14852
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
-%global gh_date      20151007
+%global gh_date      20151030
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.0.0
-Release:        0.12.%{gh_date}git%{gh_short}%{?dist}
+Release:        0.14.%{gh_date}git%{gh_short}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -37,27 +37,36 @@ BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.4.4
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
 BuildRequires:  php-composer(seld/jsonlint)             >= 1.0
+BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
+BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(symfony/console)           >= 2.5
 BuildRequires:  php-composer(symfony/finder)            >= 2.2
 BuildRequires:  php-composer(symfony/filesystem)        >= 2.5
 BuildRequires:  php-composer(symfony/process)           >= 2.1
-BuildRequires:  php-composer(symfony/class-loader)
-BuildRequires:  %{_bindir}/phpunit
 BuildRequires:  php-zip
+# From composer.json, "require-dev": {
+#        "phpunit/phpunit": "^4.5 || ^5.0.5",
+#        "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
+# For autoloader
+BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  php-seld-phar-utils >= 1.0.1
+BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
+BuildRequires:  php-jsonlint        >= 1.3.1-3
 %endif
 
-# From composer.json, requires
-#        "php": ">=5.3.2",
+# From composer.json, "require": {
+#        "php": "^5.3.2 || ^7.0",
 #        "justinrainbow/json-schema": "^1.4.4",
 #        "composer/spdx-licenses": "^1.0",
 #        "composer/semver": "^1.0",
 #        "seld/jsonlint": "~1.0",
-#        "symfony/console": "~2.5",
-#        "symfony/finder": "~2.2",
-#        "symfony/process": "~2.1",
-#        "symfony/filesystem": "~2.5",
-#        "seld/phar-utils": "~1.0",
-#        "seld/cli-prompt": "~1.0"
+#        "symfony/console": "^2.5 || ^3.0",
+#        "symfony/finder": "^2.2 || ^3.0",
+#        "symfony/process": "^2.1 || ^3.0",
+#        "symfony/filesystem": "^2.5 || ^3.0",
+#        "seld/phar-utils": "^1.0",
+#        "seld/cli-prompt": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-composer(justinrainbow/json-schema) >= 1.4.4
@@ -73,13 +82,13 @@ Requires:       php-composer(seld/phar-utils)           <  2
 Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(symfony/console)           >= 2.5
-Requires:       php-composer(symfony/console)           <  3
+Requires:       php-composer(symfony/console)           <  4
 Requires:       php-composer(symfony/finder)            >= 2.2
-Requires:       php-composer(symfony/finder)            <  3
+Requires:       php-composer(symfony/finder)            <  4
 Requires:       php-composer(symfony/process)           >= 2.1
-Requires:       php-composer(symfony/process)           <  3
+Requires:       php-composer(symfony/process)           <  4
 Requires:       php-composer(symfony/filesystem)        >= 2.5
-Requires:       php-composer(symfony/filesystem)        <  3
+Requires:       php-composer(symfony/filesystem)        <  4
 # From composer.json, suggest
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages"
@@ -87,6 +96,9 @@ Requires:       php-zip
 Requires:       php-openssl
 # For our autoloader
 Requires:       php-composer(symfony/class-loader)
+Requires:       php-seld-phar-utils >= 1.0.1
+Requires:       php-seld-cli-prompt >= 1.0.0-3
+Requires:       php-jsonlint        >= 1.3.1-3
 # From phpcompatinfo
 Requires:       php-curl
 Requires:       php-date
@@ -188,6 +200,11 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Mon Nov  2 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.14.20151030git5a5088e
+- new snapshot
+- allow symfony 3
+- use autoloader from all dependencies
+
 * Sun Oct 11 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.12.20151007git7a9eb02
 - new snapshot
 - provide php-composer(composer-plugin-api)
@@ -195,7 +212,6 @@ export BUILDROOT=%{buildroot}
 - add dependency on composer/semver
 - add dependency on symfony/filesystem
 
-
 * Tue Sep  8 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.9.20150907git9f6fdfd
 - new snapshot
 - add LICENSE in application data, as used by the code
diff --git a/sources b/sources
index 4a0463f..e1b4a49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5ae42eaebfcf4b405247d3ec77e46b3  composer-1.0.0-7a9eb02.tar.gz
+f19601c7374366d9cf44bd31670483c2  composer-1.0.0-5a5088e.tar.gz

From be209063f5ebcd4bfc7ff83f6d10ed8e2020f080 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 16 Nov 2015 14:01:46 +0100
Subject: [PATCH 004/269] version 1.0.0alpha11

---
 .gitignore    |  1 +
 composer.spec | 17 +++++++++++++----
 sources       |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25b6d6e..be4c97d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ clog
 /composer-1.0.0-7a9eb02.tar.gz
 /composer-1.0.0-a54f84f.tar.gz
 /composer-1.0.0-5a5088e.tar.gz
+/composer-1.0.0-cd9054c.tar.gz
diff --git a/composer.spec b/composer.spec
index b24c136..4d9e14f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,18 +6,19 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    5a5088eb342e4876cb28472ba1fc3f1da7a14852
+%global gh_commit    cd9054ce2abd1d06ed0eb1244eba1b2c2af633b6
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_branch    1.0-dev
-%global gh_date      20151030
+#global gh_branch    1.0-dev
+#global gh_date      20151114
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.0.0
+%global prever       alpha11
 
 Name:           composer
 Version:        1.0.0
-Release:        0.14.%{gh_date}git%{gh_short}%{?dist}
+Release:        0.15.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -142,12 +143,17 @@ cp -p %{SOURCE2} tests/bootstrap.php
 rm src/bootstrap.php
 
 : fix reported version
+%if 0%{?gh_date}
 DATE=%{gh_date}
 DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6:2}
 sed -e '/VERSION/s/@package_version@/%{gh_commit}/' \
     -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@/%{gh_branch}/' \
     -e "/RELEASE_DATE/s/@release_date@/$DATE/" \
     -i src/Composer/Composer.php
+%else
+sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \
+    -i src/Composer/Composer.php
+%endif
 
 : check Plugin API version
 php -r '
@@ -200,6 +206,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Sat Nov 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.15.alpha1
+- update to 1.0.0alpha11
+
 * Mon Nov  2 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.14.20151030git5a5088e
 - new snapshot
 - allow symfony 3
diff --git a/sources b/sources
index e1b4a49..476d3e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f19601c7374366d9cf44bd31670483c2  composer-1.0.0-5a5088e.tar.gz
+89cc0fba32dcbb4e4012ad38148afb96  composer-1.0.0-cd9054c.tar.gz

From 9bfbabb2d08fef46431322ddc3c76855e2abe7f7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 16 Nov 2015 14:01:46 +0100
Subject: [PATCH 005/269] version 1.0.0alpha11

(cherry picked from commit be209063f5ebcd4bfc7ff83f6d10ed8e2020f080)
---
 .gitignore    |  1 +
 composer.spec | 17 +++++++++++++----
 sources       |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 25b6d6e..be4c97d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ clog
 /composer-1.0.0-7a9eb02.tar.gz
 /composer-1.0.0-a54f84f.tar.gz
 /composer-1.0.0-5a5088e.tar.gz
+/composer-1.0.0-cd9054c.tar.gz
diff --git a/composer.spec b/composer.spec
index 8c2b419..2bb1287 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,18 +6,19 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    5a5088eb342e4876cb28472ba1fc3f1da7a14852
+%global gh_commit    cd9054ce2abd1d06ed0eb1244eba1b2c2af633b6
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_branch    1.0-dev
-%global gh_date      20151030
+#global gh_branch    1.0-dev
+#global gh_date      20151114
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.0.0
+%global prever       alpha11
 
 Name:           composer
 Version:        1.0.0
-Release:        0.14.%{gh_date}git%{gh_short}%{?dist}
+Release:        0.15.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -142,12 +143,17 @@ cp -p %{SOURCE2} tests/bootstrap.php
 rm src/bootstrap.php
 
 : fix reported version
+%if 0%{?gh_date}
 DATE=%{gh_date}
 DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6:2}
 sed -e '/VERSION/s/@package_version@/%{gh_commit}/' \
     -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@/%{gh_branch}/' \
     -e "/RELEASE_DATE/s/@release_date@/$DATE/" \
     -i src/Composer/Composer.php
+%else
+sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \
+    -i src/Composer/Composer.php
+%endif
 
 : check Plugin API version
 php -r '
@@ -200,6 +206,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Sat Nov 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.15.alpha1
+- update to 1.0.0alpha11
+
 * Mon Nov  2 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.14.20151030git5a5088e
 - new snapshot
 - allow symfony 3
diff --git a/sources b/sources
index e1b4a49..476d3e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f19601c7374366d9cf44bd31670483c2  composer-1.0.0-5a5088e.tar.gz
+89cc0fba32dcbb4e4012ad38148afb96  composer-1.0.0-cd9054c.tar.gz

From d8704bc11c9f7b54e187552a69083bcf9db7ba37 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 7 Jan 2016 08:36:21 +0100
Subject: [PATCH 006/269] remove duplicated register in autoloader

---
 composer-autoload.php | 3 ++-
 composer.spec         | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/composer-autoload.php b/composer-autoload.php
index 71f153e..811b39c 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -1,4 +1,6 @@
 <?php
+/* Autoloader for composer/composer and its dependencies */
+
 $vendorDir = '/usr/share/php';
 // Use Symfony autoloader
 if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
@@ -14,7 +16,6 @@ $fedoraClassLoader->addPrefixes(array(
     'Symfony\\Component\\'         => $vendorDir,
     'Composer\\'                   => dirname(__DIR__)
 ));
-$fedoraClassLoader->register();
 
 // Dependencies
 require_once $vendorDir . '/Seld/JsonLint/autoload.php';
diff --git a/composer.spec b/composer.spec
index 4d9e14f..bf00e8b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015 Remi Collet
+# Copyright (c) 2015-2016 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -18,7 +18,7 @@
 
 Name:           composer
 Version:        1.0.0
-Release:        0.15.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release:        0.16.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -206,6 +206,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Thu Jan  7 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.16.alpha1
+- remove duplicated register in autoloader
+
 * Sat Nov 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.15.alpha1
 - update to 1.0.0alpha11
 

From a5c0d75055b2f0569ff61650b22d85534aab78d3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 8 Jan 2016 07:58:50 +0100
Subject: [PATCH 007/269] - add patch for json-schema 1.6, FTBFS detected by
 Koschei, open https://github.com/composer/composer/pull/4756 - new snapshot -
 raise dependency on seld/jsonlint ^1.4

---
 .gitignore            |  1 +
 composer-pr4756.patch | 79 +++++++++++++++++++++++++++++++++++++++++++
 composer-rpm.patch    | 44 ++++++++++++------------
 composer.spec         | 30 ++++++++++------
 sources               |  2 +-
 5 files changed, 122 insertions(+), 34 deletions(-)
 create mode 100644 composer-pr4756.patch

diff --git a/.gitignore b/.gitignore
index be4c97d..988000a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ clog
 /composer-1.0.0-a54f84f.tar.gz
 /composer-1.0.0-5a5088e.tar.gz
 /composer-1.0.0-cd9054c.tar.gz
+/composer-1.0.0-64b0d72.tar.gz
diff --git a/composer-pr4756.patch b/composer-pr4756.patch
new file mode 100644
index 0000000..b8cb644
--- /dev/null
+++ b/composer-pr4756.patch
@@ -0,0 +1,79 @@
+From 0f22bc3cd6c0877373e98204146e27d46ec3fc8b Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Fri, 8 Jan 2016 07:39:25 +0100
+Subject: [PATCH] Fix tests for justinrainbow/json-schema 1.6
+
+---
+ tests/Composer/Test/Json/ComposerSchemaTest.php | 31 +++++++++++++++++++++----
+ 1 file changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/tests/Composer/Test/Json/ComposerSchemaTest.php b/tests/Composer/Test/Json/ComposerSchemaTest.php
+index 14521fa..c45fdbe 100644
+--- a/tests/Composer/Test/Json/ComposerSchemaTest.php
++++ b/tests/Composer/Test/Json/ComposerSchemaTest.php
+@@ -19,23 +19,44 @@
+  */
+ class ComposerSchemaTest extends \PHPUnit_Framework_TestCase
+ {
++    private function extractNeeded($in)
++    {
++        if (!is_array($in)) {
++            return $in;
++        }
++        // Cleanup JsonSchema output
++        // Keep only used / checked properties
++        // So drop new properties introduced in 1.6
++        $out = array();
++        foreach ($in as $i => $err) {
++            $out[$i] = array();
++            if (isset($err['property'])) {
++                $out[$i]['property'] = $err['property'];
++            }
++            if (isset($err['message'])) {
++                $out[$i]['message'] = $err['message'];
++            }
++        }
++        return $out;
++    }
++
+     public function testRequiredProperties()
+     {
+         $json = '{ }';
+         $this->assertEquals(array(
+             array('property' => 'name', 'message' => 'The property name is required'),
+             array('property' => 'description', 'message' => 'The property description is required'),
+-        ), $this->check($json));
++        ), $this->extractNeeded($this->check($json)));
+ 
+         $json = '{ "name": "vendor/package" }';
+         $this->assertEquals(array(
+             array('property' => 'description', 'message' => 'The property description is required'),
+-        ), $this->check($json));
++        ), $this->extractNeeded($this->check($json)));
+ 
+         $json = '{ "description": "generic description" }';
+         $this->assertEquals(array(
+             array('property' => 'name', 'message' => 'The property name is required'),
+-        ), $this->check($json));
++        ), $this->extractNeeded($this->check($json)));
+     }
+ 
+     public function testOptionalAbandonedProperty()
+@@ -52,7 +73,7 @@ public function testMinimumStabilityValues()
+                 'property' => 'minimum-stability',
+                 'message' => 'Does not match the regex pattern ^dev|alpha|beta|rc|RC|stable$',
+             ),
+-        ), $this->check($json), 'empty string');
++        ), $this->extractNeeded($this->check($json)), 'empty string');
+ 
+         $json = '{ "name": "vendor/package", "description": "generic description", "minimum-stability": "dummy" }';
+         $this->assertEquals(array(
+@@ -60,7 +81,7 @@ public function testMinimumStabilityValues()
+                 'property' => 'minimum-stability',
+                 'message' => 'Does not match the regex pattern ^dev|alpha|beta|rc|RC|stable$',
+             ),
+-        ), $this->check($json), 'dummy');
++        ), $this->extractNeeded($this->check($json)), 'dummy');
+ 
+         $json = '{ "name": "vendor/package", "description": "generic description", "minimum-stability": "dev" }';
+         $this->assertTrue($this->check($json), 'dev');
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 9ac2a38..e16d05d 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2015-09-20 20:44:55.000000000 +0200
-+++ ./bin/composer	2015-09-21 17:38:08.532640919 +0200
+--- ./bin/composer.rpm	2015-12-15 10:35:39.000000000 +0100
++++ ./bin/composer	2015-12-15 16:14:05.574860901 +0100
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -11,33 +11,21 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2015-09-21 17:38:08.532640919 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2015-09-21 17:38:58.418873383 +0200
-@@ -290,7 +290,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2015-12-15 16:14:05.575860906 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2015-12-15 16:14:18.054913016 +0100
+@@ -287,7 +287,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
 -        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
 +        $this->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE');
  
-         $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
-             'optimize' => (bool) $scanPsr0Packages,
-diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2015-09-20 20:44:55.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2015-09-21 17:38:08.532640919 +0200
-@@ -149,7 +149,7 @@ class JsonFile
-             self::validateSyntax($content, $this->path);
-         }
- 
--        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
-+        $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
-         $schemaData = json_decode(file_get_contents($schemaFile));
- 
-         if ($schema === self::LAX_SCHEMA) {
+         if ($this->runScripts) {
+             $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Command/DiagnoseCommand.php.rpm ./src/Composer/Command/DiagnoseCommand.php
---- ./src/Composer/Command/DiagnoseCommand.php.rpm	2015-10-07 12:05:33.000000000 +0200
-+++ ./src/Composer/Command/DiagnoseCommand.php	2015-10-11 19:45:58.427641279 +0200
-@@ -132,9 +132,6 @@
+--- ./src/Composer/Command/DiagnoseCommand.php.rpm	2015-12-15 10:35:39.000000000 +0100
++++ ./src/Composer/Command/DiagnoseCommand.php	2015-12-15 16:14:05.575860906 +0100
+@@ -132,9 +132,6 @@ EOT
          $io->write('Checking disk free space: ', false);
          $this->outputResult($this->checkDiskSpace($config));
  
@@ -47,3 +35,15 @@ diff -up ./src/Composer/Command/DiagnoseCommand.php.rpm ./src/Composer/Command/D
          return $this->failures;
      }
  
+diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
+--- ./src/Composer/Json/JsonFile.php.rpm	2015-12-15 10:35:39.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2015-12-15 16:14:05.575860906 +0100
+@@ -149,7 +149,7 @@ class JsonFile
+             self::validateSyntax($content, $this->path);
+         }
+ 
+-        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
++        $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
+         $schemaData = json_decode(file_get_contents($schemaFile));
+ 
+         if ($schema === self::LAX_SCHEMA) {
diff --git a/composer.spec b/composer.spec
index bf00e8b..d601b03 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,19 +6,19 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    cd9054ce2abd1d06ed0eb1244eba1b2c2af633b6
+%global gh_commit    64b0d721838cdceef679761c5cf69a0d070d14c9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-#global gh_branch    1.0-dev
-#global gh_date      20151114
+%global gh_branch    1.0-dev
+%global gh_date      20160106
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.0.0
-%global prever       alpha11
+#global prever       alpha11
 
 Name:           composer
 Version:        1.0.0
-Release:        0.16.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release:        0.18.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -30,6 +30,8 @@ Source2:        %{name}-bootstrap.php
 
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
+# See https://github.com/composer/composer/pull/4756
+Patch1:         %{name}-pr4756.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
@@ -37,7 +39,7 @@ BuildRequires:  php-cli
 BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.4.4
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
-BuildRequires:  php-composer(seld/jsonlint)             >= 1.0
+BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
 BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(symfony/console)           >= 2.5
@@ -53,7 +55,6 @@ BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
 BuildRequires:  php-composer(symfony/class-loader)
 BuildRequires:  php-seld-phar-utils >= 1.0.1
 BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
-BuildRequires:  php-jsonlint        >= 1.3.1-3
 %endif
 
 # From composer.json, "require": {
@@ -61,7 +62,7 @@ BuildRequires:  php-jsonlint        >= 1.3.1-3
 #        "justinrainbow/json-schema": "^1.4.4",
 #        "composer/spdx-licenses": "^1.0",
 #        "composer/semver": "^1.0",
-#        "seld/jsonlint": "~1.0",
+#        "seld/jsonlint": "~1.4",
 #        "symfony/console": "^2.5 || ^3.0",
 #        "symfony/finder": "^2.2 || ^3.0",
 #        "symfony/process": "^2.1 || ^3.0",
@@ -76,7 +77,7 @@ Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/semver)           >= 1.0
 Requires:       php-composer(composer/semver)           <  2
-Requires:       php-composer(seld/jsonlint)             >= 1.0
+Requires:       php-composer(seld/jsonlint)             >= 1.4
 Requires:       php-composer(seld/jsonlint)             <  2
 Requires:       php-composer(seld/phar-utils)           >= 1.0
 Requires:       php-composer(seld/phar-utils)           <  2
@@ -99,7 +100,6 @@ Requires:       php-openssl
 Requires:       php-composer(symfony/class-loader)
 Requires:       php-seld-phar-utils >= 1.0.1
 Requires:       php-seld-cli-prompt >= 1.0.0-3
-Requires:       php-jsonlint        >= 1.3.1-3
 # From phpcompatinfo
 Requires:       php-curl
 Requires:       php-date
@@ -136,7 +136,9 @@ Documentation: https://getcomposer.org/doc/
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-%patch0 -p1
+%patch0 -p1 -b .rpm
+%patch1 -p1 -b .rpm
+find . -name \*.rpm -exec rm {} \; -print
 
 cp -p %{SOURCE1} src/Composer/autoload.php
 cp -p %{SOURCE2} tests/bootstrap.php
@@ -206,6 +208,12 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Fri Jan  8 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.18.20160106git64b0d72
+- add patch for json-schema 1.6, FTBFS detected by Koschei
+  open https://github.com/composer/composer/pull/4756
+- new snapshot
+- raise dependency on seld/jsonlint ^1.4
+
 * Thu Jan  7 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.16.alpha1
 - remove duplicated register in autoloader
 
diff --git a/sources b/sources
index 476d3e1..8cdba7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-89cc0fba32dcbb4e4012ad38148afb96  composer-1.0.0-cd9054c.tar.gz
+0839204722396456aa9dc1f04ed5bd32  composer-1.0.0-64b0d72.tar.gz

From ccf4d7226f38665741ee17cbd6ef510d7e4854bd Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 3 Feb 2016 18:01:54 +0000
Subject: [PATCH 008/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index d601b03..3d15743 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 
 Name:           composer
 Version:        1.0.0
-Release:        0.18.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release:        0.19.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -208,6 +208,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-0.19.20160106git64b0d72
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Fri Jan  8 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.18.20160106git64b0d72
 - add patch for json-schema 1.6, FTBFS detected by Koschei
   open https://github.com/composer/composer/pull/4756

From 8bed8f917ad04de1b933e3049bcad10814e47ca9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 23 Feb 2016 15:48:26 +0100
Subject: [PATCH 009/269] 20160120

---
 .gitignore            |  1 +
 composer-pr4756.patch | 79 -------------------------------------------
 composer-rpm.patch    | 23 +++++++------
 composer.spec         | 30 ++++++++++------
 sources               |  2 +-
 5 files changed, 35 insertions(+), 100 deletions(-)
 delete mode 100644 composer-pr4756.patch

diff --git a/.gitignore b/.gitignore
index 988000a..57eefb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ clog
 /composer-1.0.0-5a5088e.tar.gz
 /composer-1.0.0-cd9054c.tar.gz
 /composer-1.0.0-64b0d72.tar.gz
+/composer-1.0.0-4c0e163.tar.gz
diff --git a/composer-pr4756.patch b/composer-pr4756.patch
deleted file mode 100644
index b8cb644..0000000
--- a/composer-pr4756.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 0f22bc3cd6c0877373e98204146e27d46ec3fc8b Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Fri, 8 Jan 2016 07:39:25 +0100
-Subject: [PATCH] Fix tests for justinrainbow/json-schema 1.6
-
----
- tests/Composer/Test/Json/ComposerSchemaTest.php | 31 +++++++++++++++++++++----
- 1 file changed, 26 insertions(+), 5 deletions(-)
-
-diff --git a/tests/Composer/Test/Json/ComposerSchemaTest.php b/tests/Composer/Test/Json/ComposerSchemaTest.php
-index 14521fa..c45fdbe 100644
---- a/tests/Composer/Test/Json/ComposerSchemaTest.php
-+++ b/tests/Composer/Test/Json/ComposerSchemaTest.php
-@@ -19,23 +19,44 @@
-  */
- class ComposerSchemaTest extends \PHPUnit_Framework_TestCase
- {
-+    private function extractNeeded($in)
-+    {
-+        if (!is_array($in)) {
-+            return $in;
-+        }
-+        // Cleanup JsonSchema output
-+        // Keep only used / checked properties
-+        // So drop new properties introduced in 1.6
-+        $out = array();
-+        foreach ($in as $i => $err) {
-+            $out[$i] = array();
-+            if (isset($err['property'])) {
-+                $out[$i]['property'] = $err['property'];
-+            }
-+            if (isset($err['message'])) {
-+                $out[$i]['message'] = $err['message'];
-+            }
-+        }
-+        return $out;
-+    }
-+
-     public function testRequiredProperties()
-     {
-         $json = '{ }';
-         $this->assertEquals(array(
-             array('property' => 'name', 'message' => 'The property name is required'),
-             array('property' => 'description', 'message' => 'The property description is required'),
--        ), $this->check($json));
-+        ), $this->extractNeeded($this->check($json)));
- 
-         $json = '{ "name": "vendor/package" }';
-         $this->assertEquals(array(
-             array('property' => 'description', 'message' => 'The property description is required'),
--        ), $this->check($json));
-+        ), $this->extractNeeded($this->check($json)));
- 
-         $json = '{ "description": "generic description" }';
-         $this->assertEquals(array(
-             array('property' => 'name', 'message' => 'The property name is required'),
--        ), $this->check($json));
-+        ), $this->extractNeeded($this->check($json)));
-     }
- 
-     public function testOptionalAbandonedProperty()
-@@ -52,7 +73,7 @@ public function testMinimumStabilityValues()
-                 'property' => 'minimum-stability',
-                 'message' => 'Does not match the regex pattern ^dev|alpha|beta|rc|RC|stable$',
-             ),
--        ), $this->check($json), 'empty string');
-+        ), $this->extractNeeded($this->check($json)), 'empty string');
- 
-         $json = '{ "name": "vendor/package", "description": "generic description", "minimum-stability": "dummy" }';
-         $this->assertEquals(array(
-@@ -60,7 +81,7 @@ public function testMinimumStabilityValues()
-                 'property' => 'minimum-stability',
-                 'message' => 'Does not match the regex pattern ^dev|alpha|beta|rc|RC|stable$',
-             ),
--        ), $this->check($json), 'dummy');
-+        ), $this->extractNeeded($this->check($json)), 'dummy');
- 
-         $json = '{ "name": "vendor/package", "description": "generic description", "minimum-stability": "dev" }';
-         $this->assertTrue($this->check($json), 'dev');
diff --git a/composer-rpm.patch b/composer-rpm.patch
index e16d05d..2c3b7e2 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2015-12-15 10:35:39.000000000 +0100
-+++ ./bin/composer	2015-12-15 16:14:05.574860901 +0100
+--- ./bin/composer.rpm	2016-01-27 14:04:22.000000000 +0100
++++ ./bin/composer	2016-01-27 16:32:11.313455545 +0100
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -11,8 +11,8 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2015-12-15 16:14:05.575860906 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2015-12-15 16:14:18.054913016 +0100
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-01-27 14:04:22.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-01-27 16:32:11.313455545 +0100
 @@ -287,7 +287,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader));
  
@@ -23,12 +23,15 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Command/DiagnoseCommand.php.rpm ./src/Composer/Command/DiagnoseCommand.php
---- ./src/Composer/Command/DiagnoseCommand.php.rpm	2015-12-15 10:35:39.000000000 +0100
-+++ ./src/Composer/Command/DiagnoseCommand.php	2015-12-15 16:14:05.575860906 +0100
-@@ -132,9 +132,6 @@ EOT
+--- ./src/Composer/Command/DiagnoseCommand.php.rpm	2016-01-27 14:04:22.000000000 +0100
++++ ./src/Composer/Command/DiagnoseCommand.php	2016-01-27 16:33:31.333845672 +0100
+@@ -134,12 +134,6 @@ EOT
          $io->write('Checking disk free space: ', false);
          $this->outputResult($this->checkDiskSpace($config));
  
+-        $io->write('Checking pubkeys: ', false);
+-        $this->outputResult($this->checkPubKeys($config));
+-
 -        $io->write('Checking composer version: ', false);
 -        $this->outputResult($this->checkVersion());
 -
@@ -36,9 +39,9 @@ diff -up ./src/Composer/Command/DiagnoseCommand.php.rpm ./src/Composer/Command/D
      }
  
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2015-12-15 10:35:39.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2015-12-15 16:14:05.575860906 +0100
-@@ -149,7 +149,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2016-01-27 14:04:22.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2016-01-27 16:32:11.313455545 +0100
+@@ -155,7 +155,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
  
diff --git a/composer.spec b/composer.spec
index 3d15743..f88576f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,10 +6,10 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    64b0d721838cdceef679761c5cf69a0d070d14c9
+%global gh_commit    4c0e163977f8289288df7b37e0fd0469d3e8cbc6
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
-%global gh_date      20160106
+%global gh_date      20160220
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
@@ -18,7 +18,7 @@
 
 Name:           composer
 Version:        1.0.0
-Release:        0.19.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release:        0.20.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -30,13 +30,11 @@ Source2:        %{name}-bootstrap.php
 
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
-# See https://github.com/composer/composer/pull/4756
-Patch1:         %{name}-pr4756.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.4.4
+BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.6
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
 BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
@@ -59,7 +57,7 @@ BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^1.4.4",
+#        "justinrainbow/json-schema": "^1.6",
 #        "composer/spdx-licenses": "^1.0",
 #        "composer/semver": "^1.0",
 #        "seld/jsonlint": "~1.4",
@@ -71,7 +69,7 @@ BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
 #        "seld/cli-prompt": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-composer(justinrainbow/json-schema) >= 1.4.4
+Requires:       php-composer(justinrainbow/json-schema) >= 1.6
 Requires:       php-composer(justinrainbow/json-schema) <  2
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
@@ -137,7 +135,6 @@ Documentation: https://getcomposer.org/doc/
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p1 -b .rpm
-%patch1 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
 
 cp -p %{SOURCE1} src/Composer/autoload.php
@@ -172,6 +169,7 @@ if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
 
 
 %install
+
 : Library
 mkdir -p     %{buildroot}%{_datadir}/php
 cp -pr src/* %{buildroot}%{_datadir}/php
@@ -189,9 +187,17 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 %check
 %if %{with_tests}
+%if 0%{?rhel} == 5
+rm tests/Composer/Test/Downloader/XzDownloaderTest.php
+%endif
+
 : Run test suite
 export BUILDROOT=%{buildroot}
 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
+
+if which php70; then
+   php70 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
+fi
 %else
 : Test suite disabled
 %endif
@@ -208,6 +214,10 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Tue Feb 23 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.20.201602git4c0e163
+- new snapshot
+- raise dependency on justinrainbow/json-schema ^1.6
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-0.19.20160106git64b0d72
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -308,4 +318,4 @@ export BUILDROOT=%{buildroot}
 - new snapshot
 
 * Thu Feb 26 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.1.20150225gite5985a9
-- Initial package
\ No newline at end of file
+- Initial package
diff --git a/sources b/sources
index 8cdba7d..5b3f896 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0839204722396456aa9dc1f04ed5bd32  composer-1.0.0-64b0d72.tar.gz
+d5438548a3ef380ad961744195bb345d  composer-1.0.0-4c0e163.tar.gz

From 567b0a839520f2bb6a7a36f5217276a7b231ed03 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 4 Mar 2016 07:33:56 +0100
Subject: [PATCH 010/269] v1.0.0beta1

---
 .gitignore         |  1 +
 composer-rpm.patch | 16 ----------------
 composer.spec      | 11 +++++++----
 sources            |  2 +-
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 57eefb8..0bf3827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ clog
 /composer-1.0.0-cd9054c.tar.gz
 /composer-1.0.0-64b0d72.tar.gz
 /composer-1.0.0-4c0e163.tar.gz
+/composer-1.0.0-5cb2b52.tar.gz
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 2c3b7e2..108900f 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -22,22 +22,6 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
  
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
-diff -up ./src/Composer/Command/DiagnoseCommand.php.rpm ./src/Composer/Command/DiagnoseCommand.php
---- ./src/Composer/Command/DiagnoseCommand.php.rpm	2016-01-27 14:04:22.000000000 +0100
-+++ ./src/Composer/Command/DiagnoseCommand.php	2016-01-27 16:33:31.333845672 +0100
-@@ -134,12 +134,6 @@ EOT
-         $io->write('Checking disk free space: ', false);
-         $this->outputResult($this->checkDiskSpace($config));
- 
--        $io->write('Checking pubkeys: ', false);
--        $this->outputResult($this->checkPubKeys($config));
--
--        $io->write('Checking composer version: ', false);
--        $this->outputResult($this->checkVersion());
--
-         return $this->failures;
-     }
- 
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
 --- ./src/Composer/Json/JsonFile.php.rpm	2016-01-27 14:04:22.000000000 +0100
 +++ ./src/Composer/Json/JsonFile.php	2016-01-27 16:32:11.313455545 +0100
diff --git a/composer.spec b/composer.spec
index f88576f..22c6f88 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,19 +6,19 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    4c0e163977f8289288df7b37e0fd0469d3e8cbc6
+%global gh_commit    5cb2b522637a941d608c58bd522f3b2a7bda4a1c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
-%global gh_date      20160220
+#global gh_date      20160220
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.0.0
-#global prever       alpha11
+%global prever       beta1
 
 Name:           composer
 Version:        1.0.0
-Release:        0.20.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release:        0.21.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -214,6 +214,9 @@ fi
 
 
 %changelog
+* Fri Mar  4 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.21.beta1
+- update to 1.0.0beta1
+
 * Tue Feb 23 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.20.201602git4c0e163
 - new snapshot
 - raise dependency on justinrainbow/json-schema ^1.6
diff --git a/sources b/sources
index 5b3f896..2b5005a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5438548a3ef380ad961744195bb345d  composer-1.0.0-4c0e163.tar.gz
+fbb93bb86f2b66b2032e494bd71594fc  composer-1.0.0-5cb2b52.tar.gz

From e9a8672c71dd66d58251b31b74f13845aef9236f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 4 Mar 2016 07:47:12 +0100
Subject: [PATCH 011/269] v1.0.0beta1

(cherry picked from commit 352b316f619ae1fc0ab9ace901a5212563a44b75)
---
 .gitignore            |  3 +++
 composer-autoload.php |  3 ++-
 composer-rpm.patch    | 33 ++++++++++---------------------
 composer.spec         | 45 ++++++++++++++++++++++++++++---------------
 sources               |  2 +-
 5 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index be4c97d..0bf3827 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@ clog
 /composer-1.0.0-a54f84f.tar.gz
 /composer-1.0.0-5a5088e.tar.gz
 /composer-1.0.0-cd9054c.tar.gz
+/composer-1.0.0-64b0d72.tar.gz
+/composer-1.0.0-4c0e163.tar.gz
+/composer-1.0.0-5cb2b52.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index 71f153e..811b39c 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -1,4 +1,6 @@
 <?php
+/* Autoloader for composer/composer and its dependencies */
+
 $vendorDir = '/usr/share/php';
 // Use Symfony autoloader
 if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
@@ -14,7 +16,6 @@ $fedoraClassLoader->addPrefixes(array(
     'Symfony\\Component\\'         => $vendorDir,
     'Composer\\'                   => dirname(__DIR__)
 ));
-$fedoraClassLoader->register();
 
 // Dependencies
 require_once $vendorDir . '/Seld/JsonLint/autoload.php';
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 9ac2a38..108900f 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2015-09-20 20:44:55.000000000 +0200
-+++ ./bin/composer	2015-09-21 17:38:08.532640919 +0200
+--- ./bin/composer.rpm	2016-01-27 14:04:22.000000000 +0100
++++ ./bin/composer	2016-01-27 16:32:11.313455545 +0100
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -11,21 +11,21 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2015-09-21 17:38:08.532640919 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2015-09-21 17:38:58.418873383 +0200
-@@ -290,7 +290,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-01-27 14:04:22.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-01-27 16:32:11.313455545 +0100
+@@ -287,7 +287,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
 -        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
 +        $this->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE');
  
-         $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
-             'optimize' => (bool) $scanPsr0Packages,
+         if ($this->runScripts) {
+             $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2015-09-20 20:44:55.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2015-09-21 17:38:08.532640919 +0200
-@@ -149,7 +149,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2016-01-27 14:04:22.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2016-01-27 16:32:11.313455545 +0100
+@@ -155,7 +155,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
  
@@ -34,16 +34,3 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          $schemaData = json_decode(file_get_contents($schemaFile));
  
          if ($schema === self::LAX_SCHEMA) {
-diff -up ./src/Composer/Command/DiagnoseCommand.php.rpm ./src/Composer/Command/DiagnoseCommand.php
---- ./src/Composer/Command/DiagnoseCommand.php.rpm	2015-10-07 12:05:33.000000000 +0200
-+++ ./src/Composer/Command/DiagnoseCommand.php	2015-10-11 19:45:58.427641279 +0200
-@@ -132,9 +132,6 @@
-         $io->write('Checking disk free space: ', false);
-         $this->outputResult($this->checkDiskSpace($config));
- 
--        $io->write('Checking composer version: ', false);
--        $this->outputResult($this->checkVersion());
--
-         return $this->failures;
-     }
- 
diff --git a/composer.spec b/composer.spec
index 2bb1287..1794e5a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,24 +1,24 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015 Remi Collet
+# Copyright (c) 2015-2016 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    cd9054ce2abd1d06ed0eb1244eba1b2c2af633b6
+%global gh_commit    5cb2b522637a941d608c58bd522f3b2a7bda4a1c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-#global gh_branch    1.0-dev
-#global gh_date      20151114
+%global gh_branch    1.0-dev
+#global gh_date      20160220
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.0.0
-%global prever       alpha11
+%global prever       beta1
 
 Name:           composer
 Version:        1.0.0
-Release:        0.15.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release:        0.21.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -34,10 +34,10 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.4.4
+BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.6
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
-BuildRequires:  php-composer(seld/jsonlint)             >= 1.0
+BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
 BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(symfony/console)           >= 2.5
@@ -53,15 +53,14 @@ BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
 BuildRequires:  php-composer(symfony/class-loader)
 BuildRequires:  php-seld-phar-utils >= 1.0.1
 BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
-BuildRequires:  php-jsonlint        >= 1.3.1-3
 %endif
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^1.4.4",
+#        "justinrainbow/json-schema": "^1.6",
 #        "composer/spdx-licenses": "^1.0",
 #        "composer/semver": "^1.0",
-#        "seld/jsonlint": "~1.0",
+#        "seld/jsonlint": "~1.4",
 #        "symfony/console": "^2.5 || ^3.0",
 #        "symfony/finder": "^2.2 || ^3.0",
 #        "symfony/process": "^2.1 || ^3.0",
@@ -70,13 +69,13 @@ BuildRequires:  php-jsonlint        >= 1.3.1-3
 #        "seld/cli-prompt": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-composer(justinrainbow/json-schema) >= 1.4.4
+Requires:       php-composer(justinrainbow/json-schema) >= 1.6
 Requires:       php-composer(justinrainbow/json-schema) <  2
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/semver)           >= 1.0
 Requires:       php-composer(composer/semver)           <  2
-Requires:       php-composer(seld/jsonlint)             >= 1.0
+Requires:       php-composer(seld/jsonlint)             >= 1.4
 Requires:       php-composer(seld/jsonlint)             <  2
 Requires:       php-composer(seld/phar-utils)           >= 1.0
 Requires:       php-composer(seld/phar-utils)           <  2
@@ -99,7 +98,6 @@ Requires:       php-openssl
 Requires:       php-composer(symfony/class-loader)
 Requires:       php-seld-phar-utils >= 1.0.1
 Requires:       php-seld-cli-prompt >= 1.0.0-3
-Requires:       php-jsonlint        >= 1.3.1-3
 # From phpcompatinfo
 Requires:       php-curl
 Requires:       php-date
@@ -136,7 +134,8 @@ Documentation: https://getcomposer.org/doc/
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-%patch0 -p1
+%patch0 -p1 -b .rpm
+find . -name \*.rpm -exec rm {} \; -print
 
 cp -p %{SOURCE1} src/Composer/autoload.php
 cp -p %{SOURCE2} tests/bootstrap.php
@@ -170,6 +169,7 @@ if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
 
 
 %install
+
 : Library
 mkdir -p     %{buildroot}%{_datadir}/php
 cp -pr src/* %{buildroot}%{_datadir}/php
@@ -187,9 +187,17 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 %check
 %if %{with_tests}
+%if 0%{?rhel} == 5
+rm tests/Composer/Test/Downloader/XzDownloaderTest.php
+%endif
+
 : Run test suite
 export BUILDROOT=%{buildroot}
 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
+
+if which php70; then
+   php70 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
+fi
 %else
 : Test suite disabled
 %endif
@@ -206,6 +214,11 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Fri Mar  4 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.21.beta1
+- update to 1.0.0beta1
+- raise dependency on justinrainbow/json-schema ^1.6
+- raise dependency on seld/jsonlint ^1.4
+
 * Sat Nov 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.15.alpha1
 - update to 1.0.0alpha11
 
@@ -291,4 +304,4 @@ export BUILDROOT=%{buildroot}
 - new snapshot
 
 * Thu Feb 26 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.1.20150225gite5985a9
-- Initial package
\ No newline at end of file
+- Initial package
diff --git a/sources b/sources
index 476d3e1..2b5005a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-89cc0fba32dcbb4e4012ad38148afb96  composer-1.0.0-cd9054c.tar.gz
+fbb93bb86f2b66b2032e494bd71594fc  composer-1.0.0-5cb2b52.tar.gz

From 79b632e141042311ac4297bf4ed3f12c1de78734 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 29 Mar 2016 06:11:29 +0200
Subject: [PATCH 012/269] v1.0.0-beta2

---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0bf3827..bbbc4ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ clog
 /composer-1.0.0-64b0d72.tar.gz
 /composer-1.0.0-4c0e163.tar.gz
 /composer-1.0.0-5cb2b52.tar.gz
+/composer-1.0.0-91d92c4.tar.gz
diff --git a/composer.spec b/composer.spec
index 22c6f88..c48a4db 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    5cb2b522637a941d608c58bd522f3b2a7bda4a1c
+%global gh_commit    91d92c4ff80e4c6573a4dc91aee08e50d2617d30
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 #global gh_date      20160220
@@ -14,11 +14,11 @@
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.0.0
-%global prever       beta1
+%global prever       beta2
 
 Name:           composer
 Version:        1.0.0
-Release:        0.21.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release:        0.22.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -214,6 +214,9 @@ fi
 
 
 %changelog
+* Tue Mar 29 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.22.beta2
+- update to 1.0.0beta2
+
 * Fri Mar  4 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.21.beta1
 - update to 1.0.0beta1
 
diff --git a/sources b/sources
index 2b5005a..0311924 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fbb93bb86f2b66b2032e494bd71594fc  composer-1.0.0-5cb2b52.tar.gz
+e848f9a445f76291701efea0b0eb9f3e  composer-1.0.0-91d92c4.tar.gz

From 6efef67c2cdc0c2094e9a82031f1dbbbf8749543 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 29 Mar 2016 06:11:29 +0200
Subject: [PATCH 013/269] v1.0.0-beta2

(cherry picked from commit 79b632e141042311ac4297bf4ed3f12c1de78734)
---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0bf3827..bbbc4ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ clog
 /composer-1.0.0-64b0d72.tar.gz
 /composer-1.0.0-4c0e163.tar.gz
 /composer-1.0.0-5cb2b52.tar.gz
+/composer-1.0.0-91d92c4.tar.gz
diff --git a/composer.spec b/composer.spec
index 1794e5a..09b5742 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    5cb2b522637a941d608c58bd522f3b2a7bda4a1c
+%global gh_commit    91d92c4ff80e4c6573a4dc91aee08e50d2617d30
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 #global gh_date      20160220
@@ -14,11 +14,11 @@
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.0.0
-%global prever       beta1
+%global prever       beta2
 
 Name:           composer
 Version:        1.0.0
-Release:        0.21.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release:        0.22.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -214,6 +214,9 @@ fi
 
 
 %changelog
+* Tue Mar 29 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.22.beta2
+- update to 1.0.0beta2
+
 * Fri Mar  4 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.21.beta1
 - update to 1.0.0beta1
 - raise dependency on justinrainbow/json-schema ^1.6
diff --git a/sources b/sources
index 2b5005a..0311924 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fbb93bb86f2b66b2032e494bd71594fc  composer-1.0.0-5cb2b52.tar.gz
+e848f9a445f76291701efea0b0eb9f3e  composer-1.0.0-91d92c4.tar.gz

From 74b2a4e08c041cdadcad26d4cea906f4237c4c62 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 5 Apr 2016 16:28:26 +0200
Subject: [PATCH 014/269] v1.0.0

---
 .gitignore    | 1 +
 composer.spec | 9 +++++----
 sources       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index bbbc4ff..375df67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ clog
 /composer-1.0.0-4c0e163.tar.gz
 /composer-1.0.0-5cb2b52.tar.gz
 /composer-1.0.0-91d92c4.tar.gz
+/composer-1.0.0-32df3aa.tar.gz
diff --git a/composer.spec b/composer.spec
index c48a4db..3443e42 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,19 +6,17 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    91d92c4ff80e4c6573a4dc91aee08e50d2617d30
+%global gh_commit    32df3aa8cdbdaa16df9491b5e672e81c87f94c78
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
-#global gh_date      20160220
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.0.0
-%global prever       beta2
 
 Name:           composer
 Version:        1.0.0
-Release:        0.22.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -214,6 +212,9 @@ fi
 
 
 %changelog
+* Tue Apr  5 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
+- update to 1.0.0
+
 * Tue Mar 29 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.22.beta2
 - update to 1.0.0beta2
 
diff --git a/sources b/sources
index 0311924..840603c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e848f9a445f76291701efea0b0eb9f3e  composer-1.0.0-91d92c4.tar.gz
+e73873217bce554df2e036b734140377  composer-1.0.0-32df3aa.tar.gz

From eb3375d9de3d6ad607ea9c6d11cc5e5e4643fd5c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 5 Apr 2016 16:28:26 +0200
Subject: [PATCH 015/269] v1.0.0

(cherry picked from commit 74b2a4e08c041cdadcad26d4cea906f4237c4c62)
---
 .gitignore    | 1 +
 composer.spec | 9 +++++----
 sources       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index bbbc4ff..375df67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ clog
 /composer-1.0.0-4c0e163.tar.gz
 /composer-1.0.0-5cb2b52.tar.gz
 /composer-1.0.0-91d92c4.tar.gz
+/composer-1.0.0-32df3aa.tar.gz
diff --git a/composer.spec b/composer.spec
index 09b5742..441ad05 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,19 +6,17 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    91d92c4ff80e4c6573a4dc91aee08e50d2617d30
+%global gh_commit    32df3aa8cdbdaa16df9491b5e672e81c87f94c78
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
-#global gh_date      20160220
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.0.0
-%global prever       beta2
 
 Name:           composer
 Version:        1.0.0
-Release:        0.22.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -214,6 +212,9 @@ fi
 
 
 %changelog
+* Tue Apr  5 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
+- update to 1.0.0
+
 * Tue Mar 29 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.22.beta2
 - update to 1.0.0beta2
 
diff --git a/sources b/sources
index 0311924..840603c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e848f9a445f76291701efea0b0eb9f3e  composer-1.0.0-91d92c4.tar.gz
+e73873217bce554df2e036b734140377  composer-1.0.0-32df3aa.tar.gz

From 3fa22bc39f7c8ee5d717a6669b617b5373e017bf Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 19 Apr 2016 07:53:00 +0200
Subject: [PATCH 016/269] - update to 1.0.1 - add dependency on ca-certificates
 - fix patch for RPM path

---
 .gitignore         |  1 +
 composer-rpm.patch | 59 ++++++++++++++++++++++++++++++++++++++++------
 composer.spec      | 20 ++++++++++++++--
 sources            |  2 +-
 4 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 375df67..7f39e21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ clog
 /composer-1.0.0-5cb2b52.tar.gz
 /composer-1.0.0-91d92c4.tar.gz
 /composer-1.0.0-32df3aa.tar.gz
+/composer-1.0.1-de0e25b.tar.gz
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 108900f..7021034 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2016-01-27 14:04:22.000000000 +0100
-+++ ./bin/composer	2016-01-27 16:32:11.313455545 +0100
+--- ./bin/composer.rpm	2016-04-18 22:14:28.000000000 +0200
++++ ./bin/composer	2016-04-19 07:15:05.420424086 +0200
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -11,8 +11,8 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-01-27 14:04:22.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-01-27 16:32:11.313455545 +0100
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-04-18 22:14:28.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-04-19 07:15:05.421424090 +0200
 @@ -287,7 +287,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader));
  
@@ -22,10 +22,31 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
  
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
+diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
+--- ./src/Composer/Compiler.php.rpm	2016-04-18 22:14:28.000000000 +0200
++++ ./src/Composer/Compiler.php	2016-04-19 07:15:05.421424090 +0200
+@@ -96,7 +96,7 @@ class Compiler
+         $finder = new Finder();
+         $finder->files()
+             ->name('*.json')
+-            ->in(__DIR__.'/../../res')
++            ->in((getenv('BUILDROOT')?:'') . '/usr/share/composer/res')
+             ->in(SpdxLicenses::getResourcesDir())
+             ->sort($finderSort)
+         ;
+@@ -138,7 +138,7 @@ class Compiler
+         }
+         $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/ClassLoader.php'));
+ 
+-        $this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../res/cacert.pem'), false);
++        $this->addFile($phar, new \SplFileInfo((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'), false);
+ 
+         $this->addComposerBin($phar);
+ 
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2016-01-27 14:04:22.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2016-01-27 16:32:11.313455545 +0100
-@@ -155,7 +155,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2016-04-18 22:14:28.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2016-04-19 07:15:05.421424090 +0200
+@@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
  
@@ -34,3 +55,27 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          $schemaData = json_decode(file_get_contents($schemaFile));
  
          if ($schema === self::LAX_SCHEMA) {
+diff -up ./src/Composer/Util/RemoteFilesystem.php.rpm ./src/Composer/Util/RemoteFilesystem.php
+--- ./src/Composer/Util/RemoteFilesystem.php.rpm	2016-04-18 22:14:28.000000000 +0200
++++ ./src/Composer/Util/RemoteFilesystem.php	2016-04-19 07:15:05.421424090 +0200
+@@ -925,7 +925,7 @@ class RemoteFilesystem
+             }
+         }
+ 
+-        return $caPath = __DIR__.'/../../../res/cacert.pem'; // Bundled with Composer, last resort
++        return $caPath = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'; // Bundled with Composer, last resort
+     }
+ 
+     /**
+diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-04-19 07:15:19.122479957 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-04-19 07:15:45.229586410 +0200
+@@ -87,7 +87,7 @@ class ComposerSchemaTest extends \PHPUni
+ 
+     private function check($json)
+     {
+-        $schema = json_decode(file_get_contents(__DIR__ . '/../../../../res/composer-schema.json'));
++        $schema = json_decode(file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'));
+         $validator = new Validator();
+         $validator->check(json_decode($json), $schema);
+ 
diff --git a/composer.spec b/composer.spec
index 3443e42..31e569c 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    32df3aa8cdbdaa16df9491b5e672e81c87f94c78
+%global gh_commit    de0e25b0d494ace6b571a9205b82d017e5cb9257
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -15,7 +15,7 @@
 %global api_version  1.0.0
 
 Name:           composer
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -53,6 +53,9 @@ BuildRequires:  php-seld-phar-utils >= 1.0.1
 BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
 %endif
 
+# ca-certificates
+Requires:       %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
 #        "justinrainbow/json-schema": "^1.6",
@@ -135,6 +138,11 @@ Documentation: https://getcomposer.org/doc/
 %patch0 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
 
+if grep -r '\.\./res'; then
+	: Patch need to fixed
+	exit 1
+fi
+
 cp -p %{SOURCE1} src/Composer/autoload.php
 cp -p %{SOURCE2} tests/bootstrap.php
 rm src/bootstrap.php
@@ -189,6 +197,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 rm tests/Composer/Test/Downloader/XzDownloaderTest.php
 %endif
 
+: Ensure not used
+rm -rf res
+
 : Run test suite
 export BUILDROOT=%{buildroot}
 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
@@ -212,6 +223,11 @@ fi
 
 
 %changelog
+* Tue Apr 19 2016 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
+- update to 1.0.1
+- add dependency on ca-certificates
+- fix patch for RPM path
+
 * Tue Apr  5 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
 - update to 1.0.0
 
diff --git a/sources b/sources
index 840603c..c635f47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e73873217bce554df2e036b734140377  composer-1.0.0-32df3aa.tar.gz
+d66d0b82133805cd63e59fffb0163563  composer-1.0.1-de0e25b.tar.gz

From 1190112e60f4f55ee0fdb36602668325bc8b1511 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 19 Apr 2016 07:53:00 +0200
Subject: [PATCH 017/269] - update to 1.0.1 - add dependency on ca-certificates
 - fix patch for RPM path

(cherry picked from commit 3fa22bc39f7c8ee5d717a6669b617b5373e017bf)
---
 .gitignore         |  1 +
 composer-rpm.patch | 59 ++++++++++++++++++++++++++++++++++++++++------
 composer.spec      | 20 ++++++++++++++--
 sources            |  2 +-
 4 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 375df67..7f39e21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ clog
 /composer-1.0.0-5cb2b52.tar.gz
 /composer-1.0.0-91d92c4.tar.gz
 /composer-1.0.0-32df3aa.tar.gz
+/composer-1.0.1-de0e25b.tar.gz
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 108900f..7021034 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2016-01-27 14:04:22.000000000 +0100
-+++ ./bin/composer	2016-01-27 16:32:11.313455545 +0100
+--- ./bin/composer.rpm	2016-04-18 22:14:28.000000000 +0200
++++ ./bin/composer	2016-04-19 07:15:05.420424086 +0200
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -11,8 +11,8 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-01-27 14:04:22.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-01-27 16:32:11.313455545 +0100
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-04-18 22:14:28.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-04-19 07:15:05.421424090 +0200
 @@ -287,7 +287,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader));
  
@@ -22,10 +22,31 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
  
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
+diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
+--- ./src/Composer/Compiler.php.rpm	2016-04-18 22:14:28.000000000 +0200
++++ ./src/Composer/Compiler.php	2016-04-19 07:15:05.421424090 +0200
+@@ -96,7 +96,7 @@ class Compiler
+         $finder = new Finder();
+         $finder->files()
+             ->name('*.json')
+-            ->in(__DIR__.'/../../res')
++            ->in((getenv('BUILDROOT')?:'') . '/usr/share/composer/res')
+             ->in(SpdxLicenses::getResourcesDir())
+             ->sort($finderSort)
+         ;
+@@ -138,7 +138,7 @@ class Compiler
+         }
+         $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/ClassLoader.php'));
+ 
+-        $this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../res/cacert.pem'), false);
++        $this->addFile($phar, new \SplFileInfo((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'), false);
+ 
+         $this->addComposerBin($phar);
+ 
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2016-01-27 14:04:22.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2016-01-27 16:32:11.313455545 +0100
-@@ -155,7 +155,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2016-04-18 22:14:28.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2016-04-19 07:15:05.421424090 +0200
+@@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
  
@@ -34,3 +55,27 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          $schemaData = json_decode(file_get_contents($schemaFile));
  
          if ($schema === self::LAX_SCHEMA) {
+diff -up ./src/Composer/Util/RemoteFilesystem.php.rpm ./src/Composer/Util/RemoteFilesystem.php
+--- ./src/Composer/Util/RemoteFilesystem.php.rpm	2016-04-18 22:14:28.000000000 +0200
++++ ./src/Composer/Util/RemoteFilesystem.php	2016-04-19 07:15:05.421424090 +0200
+@@ -925,7 +925,7 @@ class RemoteFilesystem
+             }
+         }
+ 
+-        return $caPath = __DIR__.'/../../../res/cacert.pem'; // Bundled with Composer, last resort
++        return $caPath = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'; // Bundled with Composer, last resort
+     }
+ 
+     /**
+diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-04-19 07:15:19.122479957 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-04-19 07:15:45.229586410 +0200
+@@ -87,7 +87,7 @@ class ComposerSchemaTest extends \PHPUni
+ 
+     private function check($json)
+     {
+-        $schema = json_decode(file_get_contents(__DIR__ . '/../../../../res/composer-schema.json'));
++        $schema = json_decode(file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'));
+         $validator = new Validator();
+         $validator->check(json_decode($json), $schema);
+ 
diff --git a/composer.spec b/composer.spec
index 441ad05..bfcfce3 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    32df3aa8cdbdaa16df9491b5e672e81c87f94c78
+%global gh_commit    de0e25b0d494ace6b571a9205b82d017e5cb9257
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -15,7 +15,7 @@
 %global api_version  1.0.0
 
 Name:           composer
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -53,6 +53,9 @@ BuildRequires:  php-seld-phar-utils >= 1.0.1
 BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
 %endif
 
+# ca-certificates
+Requires:       %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
 #        "justinrainbow/json-schema": "^1.6",
@@ -135,6 +138,11 @@ Documentation: https://getcomposer.org/doc/
 %patch0 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
 
+if grep -r '\.\./res'; then
+	: Patch need to fixed
+	exit 1
+fi
+
 cp -p %{SOURCE1} src/Composer/autoload.php
 cp -p %{SOURCE2} tests/bootstrap.php
 rm src/bootstrap.php
@@ -189,6 +197,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 rm tests/Composer/Test/Downloader/XzDownloaderTest.php
 %endif
 
+: Ensure not used
+rm -rf res
+
 : Run test suite
 export BUILDROOT=%{buildroot}
 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
@@ -212,6 +223,11 @@ fi
 
 
 %changelog
+* Tue Apr 19 2016 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
+- update to 1.0.1
+- add dependency on ca-certificates
+- fix patch for RPM path
+
 * Tue Apr  5 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-1
 - update to 1.0.0
 
diff --git a/sources b/sources
index 840603c..c635f47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e73873217bce554df2e036b734140377  composer-1.0.0-32df3aa.tar.gz
+d66d0b82133805cd63e59fffb0163563  composer-1.0.1-de0e25b.tar.gz

From 3696482baaf2ff2850e25a8c1db76f7e9f022c28 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 21 Apr 2016 13:58:16 +0200
Subject: [PATCH 018/269] v1.0.2

---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f39e21..de1b746 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ clog
 /composer-1.0.0-91d92c4.tar.gz
 /composer-1.0.0-32df3aa.tar.gz
 /composer-1.0.1-de0e25b.tar.gz
+/composer-1.0.2-a083aa5.tar.gz
diff --git a/composer.spec b/composer.spec
index 31e569c..3904e7d 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    de0e25b0d494ace6b571a9205b82d017e5cb9257
+%global gh_commit    a083aa5e0c9b8ad989c622638aa380c1f88a68ec
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -15,7 +15,7 @@
 %global api_version  1.0.0
 
 Name:           composer
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Thu Apr 21 2016 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
+- update to 1.0.2
+
 * Tue Apr 19 2016 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
 - update to 1.0.1
 - add dependency on ca-certificates
diff --git a/sources b/sources
index c635f47..fe52527 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d66d0b82133805cd63e59fffb0163563  composer-1.0.1-de0e25b.tar.gz
+cf1a09296e2be6323057e01376bdbdbc  composer-1.0.2-a083aa5.tar.gz

From 2954e4b77bf2f9fead7e3f981aaf099950b8bb95 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 21 Apr 2016 13:58:16 +0200
Subject: [PATCH 019/269] v1.0.2

(cherry picked from commit 3696482baaf2ff2850e25a8c1db76f7e9f022c28)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f39e21..de1b746 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ clog
 /composer-1.0.0-91d92c4.tar.gz
 /composer-1.0.0-32df3aa.tar.gz
 /composer-1.0.1-de0e25b.tar.gz
+/composer-1.0.2-a083aa5.tar.gz
diff --git a/composer.spec b/composer.spec
index bfcfce3..ee02b1e 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    de0e25b0d494ace6b571a9205b82d017e5cb9257
+%global gh_commit    a083aa5e0c9b8ad989c622638aa380c1f88a68ec
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -15,7 +15,7 @@
 %global api_version  1.0.0
 
 Name:           composer
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Thu Apr 21 2016 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
+- update to 1.0.2
+
 * Tue Apr 19 2016 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
 - update to 1.0.1
 - add dependency on ca-certificates
diff --git a/sources b/sources
index c635f47..fe52527 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d66d0b82133805cd63e59fffb0163563  composer-1.0.1-de0e25b.tar.gz
+cf1a09296e2be6323057e01376bdbdbc  composer-1.0.2-a083aa5.tar.gz

From 5c4fbe6d7a9e43eb8073313393d4fa1bae7f0b46 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 30 Apr 2016 10:03:28 +0200
Subject: [PATCH 020/269] v1.0.3

---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index de1b746..8d10775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ clog
 /composer-1.0.0-32df3aa.tar.gz
 /composer-1.0.1-de0e25b.tar.gz
 /composer-1.0.2-a083aa5.tar.gz
+/composer-1.0.3-a4a0546.tar.gz
diff --git a/composer.spec b/composer.spec
index 3904e7d..830e508 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    a083aa5e0c9b8ad989c622638aa380c1f88a68ec
+%global gh_commit    a4a0546ece469cae984219f920c75437820064ff
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -15,7 +15,7 @@
 %global api_version  1.0.0
 
 Name:           composer
-Version:        1.0.2
+Version:        1.0.3
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Sat Apr 30 2016 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
+- update to 1.0.3
+
 * Thu Apr 21 2016 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
 - update to 1.0.2
 
diff --git a/sources b/sources
index fe52527..5b42d27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf1a09296e2be6323057e01376bdbdbc  composer-1.0.2-a083aa5.tar.gz
+3e17588910ceb57d1fa8b34a0b1b20a5  composer-1.0.3-a4a0546.tar.gz

From 2b2d99f523ac784af91cffb55af928efdffc58bf Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 30 Apr 2016 10:03:28 +0200
Subject: [PATCH 021/269] v1.0.3

(cherry picked from commit 5c4fbe6d7a9e43eb8073313393d4fa1bae7f0b46)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index de1b746..8d10775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ clog
 /composer-1.0.0-32df3aa.tar.gz
 /composer-1.0.1-de0e25b.tar.gz
 /composer-1.0.2-a083aa5.tar.gz
+/composer-1.0.3-a4a0546.tar.gz
diff --git a/composer.spec b/composer.spec
index ee02b1e..a0a9177 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    a083aa5e0c9b8ad989c622638aa380c1f88a68ec
+%global gh_commit    a4a0546ece469cae984219f920c75437820064ff
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -15,7 +15,7 @@
 %global api_version  1.0.0
 
 Name:           composer
-Version:        1.0.2
+Version:        1.0.3
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -223,6 +223,9 @@ fi
 
 
 %changelog
+* Sat Apr 30 2016 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
+- update to 1.0.3
+
 * Thu Apr 21 2016 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
 - update to 1.0.2
 
diff --git a/sources b/sources
index fe52527..5b42d27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf1a09296e2be6323057e01376bdbdbc  composer-1.0.2-a083aa5.tar.gz
+3e17588910ceb57d1fa8b34a0b1b20a5  composer-1.0.3-a4a0546.tar.gz

From e0b9e34fc22dc8bff30d2ec9f9b1703107b87c54 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 18 May 2016 08:13:35 +0200
Subject: [PATCH 022/269] - update to 1.1.1 - add dependency on
 composer/ca-bundle - add dependency on psr/log - bump composer-plugin-api to
 1.1.0 - drop dependency on ca-certificates

---
 .gitignore            |  1 +
 composer-autoload.php |  3 +++
 composer-rpm.patch    | 47 ++++++++++++-------------------------------
 composer.spec         | 35 +++++++++++++++++++++++---------
 sources               |  2 +-
 5 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d10775..3f622ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ clog
 /composer-1.0.1-de0e25b.tar.gz
 /composer-1.0.2-a083aa5.tar.gz
 /composer-1.0.3-a4a0546.tar.gz
+/composer-1.1.1-48156b0.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index 811b39c..31197f5 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -21,6 +21,9 @@ $fedoraClassLoader->addPrefixes(array(
 require_once $vendorDir . '/Seld/JsonLint/autoload.php';
 require_once $vendorDir . '/Seld/PharUtils/autoload.php';
 require_once $vendorDir . '/Seld/CliPrompt/autoload.php';
+require_once $vendorDir . '/Composer/CaBundle/autoload.php';
 require_once $vendorDir . '/Composer/Spdx/autoload.php';
 require_once $vendorDir . '/Composer/Semver/autoload.php';
 require_once $vendorDir . '/JsonSchema/autoload.php';
+require_once $vendorDir . '/Psr/Log/autoload.php';
+
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 7021034..2e2d330 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2016-04-18 22:14:28.000000000 +0200
-+++ ./bin/composer	2016-04-19 07:15:05.420424086 +0200
+--- ./bin/composer.rpm	2016-04-29 18:32:14.000000000 +0200
++++ ./bin/composer	2016-04-30 10:07:31.835289957 +0200
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -11,10 +11,10 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-04-18 22:14:28.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-04-19 07:15:05.421424090 +0200
-@@ -287,7 +287,7 @@ EOF;
-         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader));
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-04-30 10:07:31.836289961 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-04-30 10:08:50.489640789 +0200
+@@ -288,7 +288,7 @@ EOF;
+         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
 -        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
@@ -23,9 +23,9 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2016-04-18 22:14:28.000000000 +0200
-+++ ./src/Composer/Compiler.php	2016-04-19 07:15:05.421424090 +0200
-@@ -96,7 +96,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm	2016-04-29 18:32:14.000000000 +0200
++++ ./src/Composer/Compiler.php	2016-04-30 10:07:31.836289961 +0200
+@@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
              ->name('*.json')
@@ -34,18 +34,9 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->in(SpdxLicenses::getResourcesDir())
              ->sort($finderSort)
          ;
-@@ -138,7 +138,7 @@ class Compiler
-         }
-         $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/ClassLoader.php'));
- 
--        $this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../res/cacert.pem'), false);
-+        $this->addFile($phar, new \SplFileInfo((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'), false);
- 
-         $this->addComposerBin($phar);
- 
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2016-04-18 22:14:28.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2016-04-19 07:15:05.421424090 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2016-04-29 18:32:14.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2016-04-30 10:07:31.836289961 +0200
 @@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
@@ -55,21 +46,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          $schemaData = json_decode(file_get_contents($schemaFile));
  
          if ($schema === self::LAX_SCHEMA) {
-diff -up ./src/Composer/Util/RemoteFilesystem.php.rpm ./src/Composer/Util/RemoteFilesystem.php
---- ./src/Composer/Util/RemoteFilesystem.php.rpm	2016-04-18 22:14:28.000000000 +0200
-+++ ./src/Composer/Util/RemoteFilesystem.php	2016-04-19 07:15:05.421424090 +0200
-@@ -925,7 +925,7 @@ class RemoteFilesystem
-             }
-         }
- 
--        return $caPath = __DIR__.'/../../../res/cacert.pem'; // Bundled with Composer, last resort
-+        return $caPath = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'; // Bundled with Composer, last resort
-     }
- 
-     /**
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-04-19 07:15:19.122479957 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-04-19 07:15:45.229586410 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-04-29 18:32:14.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-04-30 10:07:31.836289961 +0200
 @@ -87,7 +87,7 @@ class ComposerSchemaTest extends \PHPUni
  
      private function check($json)
diff --git a/composer.spec b/composer.spec
index 830e508..8a46cc3 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,23 +6,24 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    a4a0546ece469cae984219f920c75437820064ff
+%global gh_commit    48156b0fd9888bf528fbe9c9cba6963223cdd584
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
-%global api_version  1.0.0
+%global api_version  1.1.0
+#global prever       RC
 
 Name:           composer
-Version:        1.0.3
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
 License:        MIT
 URL:            https://getcomposer.org/
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
 Source1:        %{name}-autoload.php
 Source2:        %{name}-bootstrap.php
 
@@ -34,10 +35,12 @@ BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.6
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
+BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
 BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
 BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
+BuildRequires:  php-composer(psr/log)                   >= 1.0
 BuildRequires:  php-composer(symfony/console)           >= 2.5
 BuildRequires:  php-composer(symfony/finder)            >= 2.2
 BuildRequires:  php-composer(symfony/filesystem)        >= 2.5
@@ -51,29 +54,31 @@ BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
 BuildRequires:  php-composer(symfony/class-loader)
 BuildRequires:  php-seld-phar-utils >= 1.0.1
 BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
+BuildRequires:  php-PsrLog          >= 1.0.0-8
 %endif
 
-# ca-certificates
-Requires:       %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
-
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
 #        "justinrainbow/json-schema": "^1.6",
-#        "composer/spdx-licenses": "^1.0",
+#        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
+#        "composer/spdx-licenses": "^1.0",
 #        "seld/jsonlint": "~1.4",
 #        "symfony/console": "^2.5 || ^3.0",
 #        "symfony/finder": "^2.2 || ^3.0",
 #        "symfony/process": "^2.1 || ^3.0",
 #        "symfony/filesystem": "^2.5 || ^3.0",
 #        "seld/phar-utils": "^1.0",
-#        "seld/cli-prompt": "^1.0"
+#        "seld/cli-prompt": "^1.0",
+#        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-composer(justinrainbow/json-schema) >= 1.6
 Requires:       php-composer(justinrainbow/json-schema) <  2
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
+Requires:       php-composer(composer/ca-bundle)        >= 1.0
+Requires:       php-composer(composer/ca-bundle)        <  2
 Requires:       php-composer(composer/semver)           >= 1.0
 Requires:       php-composer(composer/semver)           <  2
 Requires:       php-composer(seld/jsonlint)             >= 1.4
@@ -82,6 +87,8 @@ Requires:       php-composer(seld/phar-utils)           >= 1.0
 Requires:       php-composer(seld/phar-utils)           <  2
 Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
+Requires:       php-composer(psr/log)                   >= 1.0
+Requires:       php-composer(psr/log)                   <  2
 Requires:       php-composer(symfony/console)           >= 2.5
 Requires:       php-composer(symfony/console)           <  4
 Requires:       php-composer(symfony/finder)            >= 2.2
@@ -99,6 +106,7 @@ Requires:       php-openssl
 Requires:       php-composer(symfony/class-loader)
 Requires:       php-seld-phar-utils >= 1.0.1
 Requires:       php-seld-cli-prompt >= 1.0.0-3
+Requires:       php-PsrLog          >= 1.0.0-8
 # From phpcompatinfo
 Requires:       php-curl
 Requires:       php-date
@@ -196,6 +204,8 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 %if 0%{?rhel} == 5
 rm tests/Composer/Test/Downloader/XzDownloaderTest.php
 %endif
+sed -e 's/testDispatcherCanConvertScriptEventToCommandEventForListener/SKIP1/' \
+    -i tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
 
 : Ensure not used
 rm -rf res
@@ -223,6 +233,13 @@ fi
 
 
 %changelog
+* Tue May 17 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
+- update to 1.1.1
+- add dependency on composer/ca-bundle
+- add dependency on psr/log
+- bump composer-plugin-api to 1.1.0
+- drop dependency on ca-certificates
+
 * Sat Apr 30 2016 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
 - update to 1.0.3
 
diff --git a/sources b/sources
index 5b42d27..f58ae63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e17588910ceb57d1fa8b34a0b1b20a5  composer-1.0.3-a4a0546.tar.gz
+316f16ccf9f049bf0b845ee56b2aa452  composer-1.1.1-48156b0.tar.gz

From b6c8059b4c8f0fcc8300a28a55eecc4afc88662a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 18 May 2016 08:13:35 +0200
Subject: [PATCH 023/269] - update to 1.1.1 - add dependency on
 composer/ca-bundle - add dependency on psr/log - bump composer-plugin-api to
 1.1.0 - drop dependency on ca-certificates

(cherry picked from commit e0b9e34fc22dc8bff30d2ec9f9b1703107b87c54)
---
 .gitignore            |  1 +
 composer-autoload.php |  3 +++
 composer-rpm.patch    | 47 ++++++++++++-------------------------------
 composer.spec         | 35 +++++++++++++++++++++++---------
 sources               |  2 +-
 5 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d10775..3f622ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ clog
 /composer-1.0.1-de0e25b.tar.gz
 /composer-1.0.2-a083aa5.tar.gz
 /composer-1.0.3-a4a0546.tar.gz
+/composer-1.1.1-48156b0.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index 811b39c..31197f5 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -21,6 +21,9 @@ $fedoraClassLoader->addPrefixes(array(
 require_once $vendorDir . '/Seld/JsonLint/autoload.php';
 require_once $vendorDir . '/Seld/PharUtils/autoload.php';
 require_once $vendorDir . '/Seld/CliPrompt/autoload.php';
+require_once $vendorDir . '/Composer/CaBundle/autoload.php';
 require_once $vendorDir . '/Composer/Spdx/autoload.php';
 require_once $vendorDir . '/Composer/Semver/autoload.php';
 require_once $vendorDir . '/JsonSchema/autoload.php';
+require_once $vendorDir . '/Psr/Log/autoload.php';
+
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 7021034..2e2d330 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2016-04-18 22:14:28.000000000 +0200
-+++ ./bin/composer	2016-04-19 07:15:05.420424086 +0200
+--- ./bin/composer.rpm	2016-04-29 18:32:14.000000000 +0200
++++ ./bin/composer	2016-04-30 10:07:31.835289957 +0200
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -11,10 +11,10 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-04-18 22:14:28.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-04-19 07:15:05.421424090 +0200
-@@ -287,7 +287,7 @@ EOF;
-         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader));
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-04-30 10:07:31.836289961 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-04-30 10:08:50.489640789 +0200
+@@ -288,7 +288,7 @@ EOF;
+         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
 -        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
@@ -23,9 +23,9 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2016-04-18 22:14:28.000000000 +0200
-+++ ./src/Composer/Compiler.php	2016-04-19 07:15:05.421424090 +0200
-@@ -96,7 +96,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm	2016-04-29 18:32:14.000000000 +0200
++++ ./src/Composer/Compiler.php	2016-04-30 10:07:31.836289961 +0200
+@@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
              ->name('*.json')
@@ -34,18 +34,9 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->in(SpdxLicenses::getResourcesDir())
              ->sort($finderSort)
          ;
-@@ -138,7 +138,7 @@ class Compiler
-         }
-         $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/ClassLoader.php'));
- 
--        $this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../res/cacert.pem'), false);
-+        $this->addFile($phar, new \SplFileInfo((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'), false);
- 
-         $this->addComposerBin($phar);
- 
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2016-04-18 22:14:28.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2016-04-19 07:15:05.421424090 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2016-04-29 18:32:14.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2016-04-30 10:07:31.836289961 +0200
 @@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
@@ -55,21 +46,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          $schemaData = json_decode(file_get_contents($schemaFile));
  
          if ($schema === self::LAX_SCHEMA) {
-diff -up ./src/Composer/Util/RemoteFilesystem.php.rpm ./src/Composer/Util/RemoteFilesystem.php
---- ./src/Composer/Util/RemoteFilesystem.php.rpm	2016-04-18 22:14:28.000000000 +0200
-+++ ./src/Composer/Util/RemoteFilesystem.php	2016-04-19 07:15:05.421424090 +0200
-@@ -925,7 +925,7 @@ class RemoteFilesystem
-             }
-         }
- 
--        return $caPath = __DIR__.'/../../../res/cacert.pem'; // Bundled with Composer, last resort
-+        return $caPath = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'; // Bundled with Composer, last resort
-     }
- 
-     /**
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-04-19 07:15:19.122479957 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-04-19 07:15:45.229586410 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-04-29 18:32:14.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-04-30 10:07:31.836289961 +0200
 @@ -87,7 +87,7 @@ class ComposerSchemaTest extends \PHPUni
  
      private function check($json)
diff --git a/composer.spec b/composer.spec
index a0a9177..e905271 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,23 +6,24 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    a4a0546ece469cae984219f920c75437820064ff
+%global gh_commit    48156b0fd9888bf528fbe9c9cba6963223cdd584
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
-%global api_version  1.0.0
+%global api_version  1.1.0
+#global prever       RC
 
 Name:           composer
-Version:        1.0.3
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
 License:        MIT
 URL:            https://getcomposer.org/
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
 Source1:        %{name}-autoload.php
 Source2:        %{name}-bootstrap.php
 
@@ -34,10 +35,12 @@ BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.6
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
+BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
 BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
 BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
+BuildRequires:  php-composer(psr/log)                   >= 1.0
 BuildRequires:  php-composer(symfony/console)           >= 2.5
 BuildRequires:  php-composer(symfony/finder)            >= 2.2
 BuildRequires:  php-composer(symfony/filesystem)        >= 2.5
@@ -51,29 +54,31 @@ BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
 BuildRequires:  php-composer(symfony/class-loader)
 BuildRequires:  php-seld-phar-utils >= 1.0.1
 BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
+BuildRequires:  php-PsrLog          >= 1.0.0-8
 %endif
 
-# ca-certificates
-Requires:       %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
-
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
 #        "justinrainbow/json-schema": "^1.6",
-#        "composer/spdx-licenses": "^1.0",
+#        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
+#        "composer/spdx-licenses": "^1.0",
 #        "seld/jsonlint": "~1.4",
 #        "symfony/console": "^2.5 || ^3.0",
 #        "symfony/finder": "^2.2 || ^3.0",
 #        "symfony/process": "^2.1 || ^3.0",
 #        "symfony/filesystem": "^2.5 || ^3.0",
 #        "seld/phar-utils": "^1.0",
-#        "seld/cli-prompt": "^1.0"
+#        "seld/cli-prompt": "^1.0",
+#        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-composer(justinrainbow/json-schema) >= 1.6
 Requires:       php-composer(justinrainbow/json-schema) <  2
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
+Requires:       php-composer(composer/ca-bundle)        >= 1.0
+Requires:       php-composer(composer/ca-bundle)        <  2
 Requires:       php-composer(composer/semver)           >= 1.0
 Requires:       php-composer(composer/semver)           <  2
 Requires:       php-composer(seld/jsonlint)             >= 1.4
@@ -82,6 +87,8 @@ Requires:       php-composer(seld/phar-utils)           >= 1.0
 Requires:       php-composer(seld/phar-utils)           <  2
 Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
+Requires:       php-composer(psr/log)                   >= 1.0
+Requires:       php-composer(psr/log)                   <  2
 Requires:       php-composer(symfony/console)           >= 2.5
 Requires:       php-composer(symfony/console)           <  4
 Requires:       php-composer(symfony/finder)            >= 2.2
@@ -99,6 +106,7 @@ Requires:       php-openssl
 Requires:       php-composer(symfony/class-loader)
 Requires:       php-seld-phar-utils >= 1.0.1
 Requires:       php-seld-cli-prompt >= 1.0.0-3
+Requires:       php-PsrLog          >= 1.0.0-8
 # From phpcompatinfo
 Requires:       php-curl
 Requires:       php-date
@@ -196,6 +204,8 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 %if 0%{?rhel} == 5
 rm tests/Composer/Test/Downloader/XzDownloaderTest.php
 %endif
+sed -e 's/testDispatcherCanConvertScriptEventToCommandEventForListener/SKIP1/' \
+    -i tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
 
 : Ensure not used
 rm -rf res
@@ -223,6 +233,13 @@ fi
 
 
 %changelog
+* Tue May 17 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
+- update to 1.1.1
+- add dependency on composer/ca-bundle
+- add dependency on psr/log
+- bump composer-plugin-api to 1.1.0
+- drop dependency on ca-certificates
+
 * Sat Apr 30 2016 Remi Collet <remi@fedoraproject.org> - 1.0.3-1
 - update to 1.0.3
 
diff --git a/sources b/sources
index 5b42d27..f58ae63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e17588910ceb57d1fa8b34a0b1b20a5  composer-1.0.3-a4a0546.tar.gz
+316f16ccf9f049bf0b845ee56b2aa452  composer-1.1.1-48156b0.tar.gz

From 69f21c3af91d3c25d3012a58615e8d63761ff98a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 31 May 2016 08:09:26 +0200
Subject: [PATCH 024/269] ensure justinrainbow/json-schema v1 is used for the
 build

---
 composer.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index e905271..3595b6b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -34,6 +34,7 @@ BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.6
+BuildRequires:  php-composer(justinrainbow/json-schema) <  2
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
@@ -233,6 +234,9 @@ fi
 
 
 %changelog
+* Tue May 31 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-2
+- ensure justinrainbow/json-schema v1 is used for the build
+
 * Tue May 17 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
 - update to 1.1.1
 - add dependency on composer/ca-bundle

From 91c3aa7fabd8ae08b47141851dbae8c51c94940a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 31 May 2016 08:09:26 +0200
Subject: [PATCH 025/269] ensure justinrainbow/json-schema v1 is used for the
 build

(cherry picked from commit 69f21c3af91d3c25d3012a58615e8d63761ff98a)
---
 composer.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 8a46cc3..316e99d 100644
--- a/composer.spec
+++ b/composer.spec
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -34,6 +34,7 @@ BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.6
+BuildRequires:  php-composer(justinrainbow/json-schema) <  2
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
@@ -233,6 +234,9 @@ fi
 
 
 %changelog
+* Tue May 31 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-2
+- ensure justinrainbow/json-schema v1 is used for the build
+
 * Tue May 17 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-1
 - update to 1.1.1
 - add dependency on composer/ca-bundle

From ef9b12e09734c226ec548408015904aff77eb49d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 1 Jun 2016 07:25:07 +0200
Subject: [PATCH 026/269] v1.1.2

---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f622ea..03113c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ clog
 /composer-1.0.2-a083aa5.tar.gz
 /composer-1.0.3-a4a0546.tar.gz
 /composer-1.1.1-48156b0.tar.gz
+/composer.spec
diff --git a/composer.spec b/composer.spec
index 316e99d..a2fef98 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    48156b0fd9888bf528fbe9c9cba6963223cdd584
+%global gh_commit    b2cf67b1a575d7e648c742be2454339232ef32b2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,8 +16,8 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.1.1
-Release:        2%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -234,6 +234,9 @@ fi
 
 
 %changelog
+* Wed Jun  1 2016 Remi Collet <remi@fedoraproject.org> - 1.1.2-1
+- update to 1.1.2
+
 * Tue May 31 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-2
 - ensure justinrainbow/json-schema v1 is used for the build
 
diff --git a/sources b/sources
index f58ae63..1853ae8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-316f16ccf9f049bf0b845ee56b2aa452  composer-1.1.1-48156b0.tar.gz
+beb3a51cc02d9c1cf0c4b46944a750ca  composer.spec

From e73788f35cf850f4e209da37bbd8c843aaad84da Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 1 Jun 2016 07:31:28 +0200
Subject: [PATCH 027/269] 1.1.2 sources

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 03113c7..5931ac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ clog
 /composer-1.0.3-a4a0546.tar.gz
 /composer-1.1.1-48156b0.tar.gz
 /composer.spec
+/composer-1.1.2-b2cf67b.tar.gz
diff --git a/sources b/sources
index 1853ae8..a9b6576 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beb3a51cc02d9c1cf0c4b46944a750ca  composer.spec
+96607e6d13fd78dcdd7c5d56b755a487  composer-1.1.2-b2cf67b.tar.gz

From 1e6f4b0a0f3c4f9523a1cc18848ef90d929486e3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 1 Jun 2016 07:25:07 +0200
Subject: [PATCH 028/269] v1.1.2

(cherry picked from commit ef9b12e09734c226ec548408015904aff77eb49d)
---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f622ea..03113c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ clog
 /composer-1.0.2-a083aa5.tar.gz
 /composer-1.0.3-a4a0546.tar.gz
 /composer-1.1.1-48156b0.tar.gz
+/composer.spec
diff --git a/composer.spec b/composer.spec
index 3595b6b..c03560c 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    48156b0fd9888bf528fbe9c9cba6963223cdd584
+%global gh_commit    b2cf67b1a575d7e648c742be2454339232ef32b2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,8 +16,8 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.1.1
-Release:        2%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -234,6 +234,9 @@ fi
 
 
 %changelog
+* Wed Jun  1 2016 Remi Collet <remi@fedoraproject.org> - 1.1.2-1
+- update to 1.1.2
+
 * Tue May 31 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-2
 - ensure justinrainbow/json-schema v1 is used for the build
 
diff --git a/sources b/sources
index f58ae63..1853ae8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-316f16ccf9f049bf0b845ee56b2aa452  composer-1.1.1-48156b0.tar.gz
+beb3a51cc02d9c1cf0c4b46944a750ca  composer.spec

From 02c22762965ebeb2fe44ff80526b434490c53fb3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 1 Jun 2016 07:31:28 +0200
Subject: [PATCH 029/269] 1.1.2 sources

(cherry picked from commit e73788f35cf850f4e209da37bbd8c843aaad84da)
---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 03113c7..5931ac1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ clog
 /composer-1.0.3-a4a0546.tar.gz
 /composer-1.1.1-48156b0.tar.gz
 /composer.spec
+/composer-1.1.2-b2cf67b.tar.gz
diff --git a/sources b/sources
index 1853ae8..a9b6576 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beb3a51cc02d9c1cf0c4b46944a750ca  composer.spec
+96607e6d13fd78dcdd7c5d56b755a487  composer-1.1.2-b2cf67b.tar.gz

From 27a98a762daf6e2f34cc6052eaf136e283a9e4d1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 1 Jun 2016 07:46:20 +0200
Subject: [PATCH 030/269] 1.1.2 changelog

---
 composer.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/composer.spec b/composer.spec
index c03560c..cdb54aa 100644
--- a/composer.spec
+++ b/composer.spec
@@ -236,8 +236,6 @@ fi
 %changelog
 * Wed Jun  1 2016 Remi Collet <remi@fedoraproject.org> - 1.1.2-1
 - update to 1.1.2
-
-* Tue May 31 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-2
 - ensure justinrainbow/json-schema v1 is used for the build
 
 * Tue May 17 2016 Remi Collet <remi@fedoraproject.org> - 1.1.1-1

From 093bdcdd637a83e6f1fd89cd64fd90c7a1d8a5c6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sun, 26 Jun 2016 18:53:01 +0200
Subject: [PATCH 031/269] v1.1.3

---
 .gitignore    |  1 +
 composer.spec | 11 +++++++----
 sources       |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5931ac1..e12a698 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ clog
 /composer-1.1.1-48156b0.tar.gz
 /composer.spec
 /composer-1.1.2-b2cf67b.tar.gz
+/composer-1.1.3-30ab6f1.tar.gz
diff --git a/composer.spec b/composer.spec
index a2fef98..a9cafd0 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    b2cf67b1a575d7e648c742be2454339232ef32b2
+%global gh_commit    30ab6f1c1753267d181839142fafe022313c3c9a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.1.2
+Version:        1.1.3
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -215,8 +215,8 @@ rm -rf res
 export BUILDROOT=%{buildroot}
 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
 
-if which php70; then
-   php70 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
+if which php71; then
+   php71 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
 fi
 %else
 : Test suite disabled
@@ -234,6 +234,9 @@ fi
 
 
 %changelog
+* Sun Jun 26 2016 Remi Collet <remi@fedoraproject.org> - 1.1.3-1
+- update to 1.1.3
+
 * Wed Jun  1 2016 Remi Collet <remi@fedoraproject.org> - 1.1.2-1
 - update to 1.1.2
 
diff --git a/sources b/sources
index a9b6576..fd560a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96607e6d13fd78dcdd7c5d56b755a487  composer-1.1.2-b2cf67b.tar.gz
+55b46597ce2e840cc04729117bce821c  composer-1.1.3-30ab6f1.tar.gz

From 026c142e2f9e5de989bdb4e3ba052ed35540338c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sun, 26 Jun 2016 18:53:01 +0200
Subject: [PATCH 032/269] v1.1.3

(cherry picked from commit 093bdcdd637a83e6f1fd89cd64fd90c7a1d8a5c6)
---
 .gitignore    |  1 +
 composer.spec | 11 +++++++----
 sources       |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5931ac1..e12a698 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ clog
 /composer-1.1.1-48156b0.tar.gz
 /composer.spec
 /composer-1.1.2-b2cf67b.tar.gz
+/composer-1.1.3-30ab6f1.tar.gz
diff --git a/composer.spec b/composer.spec
index cdb54aa..5f71577 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    b2cf67b1a575d7e648c742be2454339232ef32b2
+%global gh_commit    30ab6f1c1753267d181839142fafe022313c3c9a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.1.2
+Version:        1.1.3
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -215,8 +215,8 @@ rm -rf res
 export BUILDROOT=%{buildroot}
 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
 
-if which php70; then
-   php70 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
+if which php71; then
+   php71 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
 fi
 %else
 : Test suite disabled
@@ -234,6 +234,9 @@ fi
 
 
 %changelog
+* Sun Jun 26 2016 Remi Collet <remi@fedoraproject.org> - 1.1.3-1
+- update to 1.1.3
+
 * Wed Jun  1 2016 Remi Collet <remi@fedoraproject.org> - 1.1.2-1
 - update to 1.1.2
 - ensure justinrainbow/json-schema v1 is used for the build
diff --git a/sources b/sources
index a9b6576..fd560a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96607e6d13fd78dcdd7c5d56b755a487  composer-1.1.2-b2cf67b.tar.gz
+55b46597ce2e840cc04729117bce821c  composer-1.1.3-30ab6f1.tar.gz

From 086bb572555bf801a237294d4ac3926ce51d9c14 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 19 Jul 2016 14:50:34 +0200
Subject: [PATCH 033/269] - update to 1.2.0 - switch to
 justinrainbow/json-schema v2

---
 .gitignore    |  1 +
 composer.spec | 23 +++++++++++------------
 sources       |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index e12a698..573d065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ clog
 /composer.spec
 /composer-1.1.2-b2cf67b.tar.gz
 /composer-1.1.3-30ab6f1.tar.gz
+/composer-1.2.0-b49a006.tar.gz
diff --git a/composer.spec b/composer.spec
index a9cafd0..ff95274 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    30ab6f1c1753267d181839142fafe022313c3c9a
+%global gh_commit    b49a006748a460f8dae6500ec80ed021501ce969
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.1.3
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -33,8 +33,7 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.6
-BuildRequires:  php-composer(justinrainbow/json-schema) <  2
+BuildRequires:  php-composer(justinrainbow/json-schema) >= 2.0
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
@@ -49,7 +48,7 @@ BuildRequires:  php-composer(symfony/process)           >= 2.1
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^4.5 || ^5.0.5",
-#        "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+#        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
 BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
 # For autoloader
 BuildRequires:  php-composer(symfony/class-loader)
@@ -60,7 +59,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^1.6",
+#        "justinrainbow/json-schema": "^1.6 || ^2.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.0",
@@ -74,8 +73,8 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-composer(justinrainbow/json-schema) >= 1.6
-Requires:       php-composer(justinrainbow/json-schema) <  2
+Requires:       php-composer(justinrainbow/json-schema) >= 2.0
+Requires:       php-composer(justinrainbow/json-schema) <  3
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -214,10 +213,6 @@ rm -rf res
 : Run test suite
 export BUILDROOT=%{buildroot}
 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
-
-if which php71; then
-   php71 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
-fi
 %else
 : Test suite disabled
 %endif
@@ -234,6 +229,10 @@ fi
 
 
 %changelog
+* Tue Jul 19 2016 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
+- update to 1.2.0
+- switch to justinrainbow/json-schema v2
+
 * Sun Jun 26 2016 Remi Collet <remi@fedoraproject.org> - 1.1.3-1
 - update to 1.1.3
 
diff --git a/sources b/sources
index fd560a1..8b0c16e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55b46597ce2e840cc04729117bce821c  composer-1.1.3-30ab6f1.tar.gz
+aea538bd668b42a39b391060c5d48bdc  composer-1.2.0-b49a006.tar.gz

From fa5704c12d8f044dd573bc9a54d343f437aade38 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 19 Jul 2016 14:59:23 +0200
Subject: [PATCH 034/269] fix autoload

---
 composer-autoload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer-autoload.php b/composer-autoload.php
index 31197f5..062bbe4 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -24,6 +24,6 @@ require_once $vendorDir . '/Seld/CliPrompt/autoload.php';
 require_once $vendorDir . '/Composer/CaBundle/autoload.php';
 require_once $vendorDir . '/Composer/Spdx/autoload.php';
 require_once $vendorDir . '/Composer/Semver/autoload.php';
-require_once $vendorDir . '/JsonSchema/autoload.php';
+require_once $vendorDir . '/JsonSchema2/autoload.php';
 require_once $vendorDir . '/Psr/Log/autoload.php';
 

From 1f3d313ab944ceb4a2b92b1516a00d6bc8e929c0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 19 Jul 2016 14:50:34 +0200
Subject: [PATCH 035/269] - update to 1.2.0 - switch to
 justinrainbow/json-schema v2

(cherry picked from commit 086bb572555bf801a237294d4ac3926ce51d9c14)
---
 .gitignore    |  1 +
 composer.spec | 23 +++++++++++------------
 sources       |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index e12a698..573d065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ clog
 /composer.spec
 /composer-1.1.2-b2cf67b.tar.gz
 /composer-1.1.3-30ab6f1.tar.gz
+/composer-1.2.0-b49a006.tar.gz
diff --git a/composer.spec b/composer.spec
index 5f71577..8bb9c41 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    30ab6f1c1753267d181839142fafe022313c3c9a
+%global gh_commit    b49a006748a460f8dae6500ec80ed021501ce969
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.1.3
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -33,8 +33,7 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.6
-BuildRequires:  php-composer(justinrainbow/json-schema) <  2
+BuildRequires:  php-composer(justinrainbow/json-schema) >= 2.0
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
@@ -49,7 +48,7 @@ BuildRequires:  php-composer(symfony/process)           >= 2.1
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^4.5 || ^5.0.5",
-#        "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
+#        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
 BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
 # For autoloader
 BuildRequires:  php-composer(symfony/class-loader)
@@ -60,7 +59,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^1.6",
+#        "justinrainbow/json-schema": "^1.6 || ^2.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.0",
@@ -74,8 +73,8 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-composer(justinrainbow/json-schema) >= 1.6
-Requires:       php-composer(justinrainbow/json-schema) <  2
+Requires:       php-composer(justinrainbow/json-schema) >= 2.0
+Requires:       php-composer(justinrainbow/json-schema) <  3
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -214,10 +213,6 @@ rm -rf res
 : Run test suite
 export BUILDROOT=%{buildroot}
 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
-
-if which php71; then
-   php71 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
-fi
 %else
 : Test suite disabled
 %endif
@@ -234,6 +229,10 @@ fi
 
 
 %changelog
+* Tue Jul 19 2016 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
+- update to 1.2.0
+- switch to justinrainbow/json-schema v2
+
 * Sun Jun 26 2016 Remi Collet <remi@fedoraproject.org> - 1.1.3-1
 - update to 1.1.3
 
diff --git a/sources b/sources
index fd560a1..8b0c16e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55b46597ce2e840cc04729117bce821c  composer-1.1.3-30ab6f1.tar.gz
+aea538bd668b42a39b391060c5d48bdc  composer-1.2.0-b49a006.tar.gz

From a6f2df7cb25ad89ce39da0ffc0c984dda882e028 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 19 Jul 2016 14:59:23 +0200
Subject: [PATCH 036/269] fix autoload

(cherry picked from commit fa5704c12d8f044dd573bc9a54d343f437aade38)
---
 composer-autoload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer-autoload.php b/composer-autoload.php
index 31197f5..062bbe4 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -24,6 +24,6 @@ require_once $vendorDir . '/Seld/CliPrompt/autoload.php';
 require_once $vendorDir . '/Composer/CaBundle/autoload.php';
 require_once $vendorDir . '/Composer/Spdx/autoload.php';
 require_once $vendorDir . '/Composer/Semver/autoload.php';
-require_once $vendorDir . '/JsonSchema/autoload.php';
+require_once $vendorDir . '/JsonSchema2/autoload.php';
 require_once $vendorDir . '/Psr/Log/autoload.php';
 

From 4f2b4fe52aeff78bbd7b2937837ba13e2358007a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 12 Sep 2016 15:08:58 +0200
Subject: [PATCH 037/269] v1.2.1

---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 573d065..548fedb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ clog
 /composer-1.1.2-b2cf67b.tar.gz
 /composer-1.1.3-30ab6f1.tar.gz
 /composer-1.2.0-b49a006.tar.gz
+/composer-1.2.1-16422c4.tar.gz
diff --git a/composer.spec b/composer.spec
index ff95274..84cd5fe 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    b49a006748a460f8dae6500ec80ed021501ce969
+%global gh_commit    16422c4b1ac4286f7caecf5211136dc073191672
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -229,6 +229,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Mon Sep 12 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-1
+- update to 1.2.1
+
 * Tue Jul 19 2016 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
 - update to 1.2.0
 - switch to justinrainbow/json-schema v2
diff --git a/sources b/sources
index 8b0c16e..475b435 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aea538bd668b42a39b391060c5d48bdc  composer-1.2.0-b49a006.tar.gz
+c096bd37ec8a1107edc3383962600d41  composer-1.2.1-16422c4.tar.gz

From cd8a37bbf3e48cdeafa81047bc776e80d9517b2c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 12 Sep 2016 15:08:58 +0200
Subject: [PATCH 038/269] v1.2.1

(cherry picked from commit 4f2b4fe52aeff78bbd7b2937837ba13e2358007a)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 573d065..548fedb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ clog
 /composer-1.1.2-b2cf67b.tar.gz
 /composer-1.1.3-30ab6f1.tar.gz
 /composer-1.2.0-b49a006.tar.gz
+/composer-1.2.1-16422c4.tar.gz
diff --git a/composer.spec b/composer.spec
index 8bb9c41..b450ee7 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    b49a006748a460f8dae6500ec80ed021501ce969
+%global gh_commit    16422c4b1ac4286f7caecf5211136dc073191672
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.2.0
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -229,6 +229,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Mon Sep 12 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-1
+- update to 1.2.1
+
 * Tue Jul 19 2016 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
 - update to 1.2.0
 - switch to justinrainbow/json-schema v2
diff --git a/sources b/sources
index 8b0c16e..475b435 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aea538bd668b42a39b391060c5d48bdc  composer-1.2.0-b49a006.tar.gz
+c096bd37ec8a1107edc3383962600d41  composer-1.2.1-16422c4.tar.gz

From 7c4b98af5ca455554d780339c6fdd6cc8e38c59a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 21 Oct 2016 13:42:23 +0200
Subject: [PATCH 039/269] switch from symfony/class-loader to fedora/autoloader

---
 composer-autoload.php  | 34 ++++++++++++++--------------------
 composer-bootstrap.php |  4 +++-
 composer.spec          |  9 ++++++---
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/composer-autoload.php b/composer-autoload.php
index 062bbe4..c103501 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -2,28 +2,22 @@
 /* Autoloader for composer/composer and its dependencies */
 
 $vendorDir = '/usr/share/php';
-// Use Symfony autoloader
-if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
-    if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
-        require_once $vendorDir . '/Symfony/Component/ClassLoader/ClassLoader.php';
-    }
-
-    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
-    $fedoraClassLoader->register();
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
 }
 
-$fedoraClassLoader->addPrefixes(array(
-    'Symfony\\Component\\'         => $vendorDir,
-    'Composer\\'                   => dirname(__DIR__)
-));
+\Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__);
 
 // Dependencies
-require_once $vendorDir . '/Seld/JsonLint/autoload.php';
-require_once $vendorDir . '/Seld/PharUtils/autoload.php';
-require_once $vendorDir . '/Seld/CliPrompt/autoload.php';
-require_once $vendorDir . '/Composer/CaBundle/autoload.php';
-require_once $vendorDir . '/Composer/Spdx/autoload.php';
-require_once $vendorDir . '/Composer/Semver/autoload.php';
-require_once $vendorDir . '/JsonSchema2/autoload.php';
-require_once $vendorDir . '/Psr/Log/autoload.php';
+\Fedora\Autoloader\Dependencies::required(array(
+	$vendorDir . '/Symfony/Component/autoload.php',
+	$vendorDir . '/Seld/JsonLint/autoload.php',
+	$vendorDir . '/Seld/PharUtils/autoload.php',
+	$vendorDir . '/Seld/CliPrompt/autoload.php',
+	$vendorDir . '/Composer/CaBundle/autoload.php',
+	$vendorDir . '/Composer/Spdx/autoload.php',
+	$vendorDir . '/Composer/Semver/autoload.php',
+	$vendorDir . '/JsonSchema2/autoload.php',
+	$vendorDir . '/Psr/Log/autoload.php',
+));
 
diff --git a/composer-bootstrap.php b/composer-bootstrap.php
index 713835a..5440159 100644
--- a/composer-bootstrap.php
+++ b/composer-bootstrap.php
@@ -1,4 +1,6 @@
 <?php
 require 'Composer/autoload.php';
-$fedoraClassLoader->addPrefix('Composer\\Test\\', __DIR__);
+/* \Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/'); broken for now */
+\Fedora\Autoloader\Autoload::addPsr4('Composer\\Test\\', __DIR__ . '/Composer/Test');
 require __DIR__.'/Composer/TestCase.php';
+
diff --git a/composer.spec b/composer.spec
index 84cd5fe..d8d9a5a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -51,7 +51,7 @@ BuildRequires:  php-zip
 #        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
 BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
 # For autoloader
-BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  php-composer(fedora/autoloader)
 BuildRequires:  php-seld-phar-utils >= 1.0.1
 BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
 BuildRequires:  php-PsrLog          >= 1.0.0-8
@@ -103,7 +103,7 @@ Requires:       php-composer(symfony/filesystem)        <  4
 Requires:       php-zip
 Requires:       php-openssl
 # For our autoloader
-Requires:       php-composer(symfony/class-loader)
+Requires:       php-composer(fedora/autoloader)
 Requires:       php-seld-phar-utils >= 1.0.1
 Requires:       php-seld-cli-prompt >= 1.0.0-3
 Requires:       php-PsrLog          >= 1.0.0-8
@@ -229,6 +229,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Fri Oct 21 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-2
+- switch from symfony/class-loader to fedora/autoloader
+
 * Mon Sep 12 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-1
 - update to 1.2.1
 

From 36f8838d6e9a248ee94ce78f6f6e2492f7e48905 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 4 Nov 2016 06:37:05 +0100
Subject: [PATCH 040/269] v1.2.2

---
 .gitignore    |  1 +
 composer.spec | 11 +++++++----
 sources       |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 548fedb..8b67535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ clog
 /composer-1.1.3-30ab6f1.tar.gz
 /composer-1.2.0-b49a006.tar.gz
 /composer-1.2.1-16422c4.tar.gz
+/composer-1.2.2-5465af9.tar.gz
diff --git a/composer.spec b/composer.spec
index d8d9a5a..ba63227 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    16422c4b1ac4286f7caecf5211136dc073191672
+%global gh_commit    5465af955800fa884a36f66ff65280584988efd0
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,8 +16,8 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.2.1
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -51,7 +51,7 @@ BuildRequires:  php-zip
 #        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
 BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
 # For autoloader
-BuildRequires:  php-composer(fedora/autoloader)
+BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
 BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
 BuildRequires:  php-PsrLog          >= 1.0.0-8
@@ -229,6 +229,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Thu Nov  3 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-1
+- update to 1.2.2
+
 * Fri Oct 21 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-2
 - switch from symfony/class-loader to fedora/autoloader
 
diff --git a/sources b/sources
index 475b435..3858650 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c096bd37ec8a1107edc3383962600d41  composer-1.2.1-16422c4.tar.gz
+c245b655f8755ab374879dbaace5067f  composer-1.2.2-5465af9.tar.gz

From 6dd65a9d66dd242782719a97aad0ce9d860b0b84 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 4 Nov 2016 06:43:55 +0100
Subject: [PATCH 041/269] - update to 1.2.2 - switch from symfony/class-loader
 to fedora/autoloader

(cherry picked from commit ab28d76a951adf7feee53253f7ef16b32800f456)
---
 .gitignore             |  1 +
 composer-autoload.php  | 34 ++++++++++++++--------------------
 composer-bootstrap.php |  4 +++-
 composer.spec          | 12 ++++++++----
 sources                |  2 +-
 5 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 548fedb..8b67535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ clog
 /composer-1.1.3-30ab6f1.tar.gz
 /composer-1.2.0-b49a006.tar.gz
 /composer-1.2.1-16422c4.tar.gz
+/composer-1.2.2-5465af9.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index 062bbe4..c103501 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -2,28 +2,22 @@
 /* Autoloader for composer/composer and its dependencies */
 
 $vendorDir = '/usr/share/php';
-// Use Symfony autoloader
-if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) {
-    if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) {
-        require_once $vendorDir . '/Symfony/Component/ClassLoader/ClassLoader.php';
-    }
-
-    $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader();
-    $fedoraClassLoader->register();
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
 }
 
-$fedoraClassLoader->addPrefixes(array(
-    'Symfony\\Component\\'         => $vendorDir,
-    'Composer\\'                   => dirname(__DIR__)
-));
+\Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__);
 
 // Dependencies
-require_once $vendorDir . '/Seld/JsonLint/autoload.php';
-require_once $vendorDir . '/Seld/PharUtils/autoload.php';
-require_once $vendorDir . '/Seld/CliPrompt/autoload.php';
-require_once $vendorDir . '/Composer/CaBundle/autoload.php';
-require_once $vendorDir . '/Composer/Spdx/autoload.php';
-require_once $vendorDir . '/Composer/Semver/autoload.php';
-require_once $vendorDir . '/JsonSchema2/autoload.php';
-require_once $vendorDir . '/Psr/Log/autoload.php';
+\Fedora\Autoloader\Dependencies::required(array(
+	$vendorDir . '/Symfony/Component/autoload.php',
+	$vendorDir . '/Seld/JsonLint/autoload.php',
+	$vendorDir . '/Seld/PharUtils/autoload.php',
+	$vendorDir . '/Seld/CliPrompt/autoload.php',
+	$vendorDir . '/Composer/CaBundle/autoload.php',
+	$vendorDir . '/Composer/Spdx/autoload.php',
+	$vendorDir . '/Composer/Semver/autoload.php',
+	$vendorDir . '/JsonSchema2/autoload.php',
+	$vendorDir . '/Psr/Log/autoload.php',
+));
 
diff --git a/composer-bootstrap.php b/composer-bootstrap.php
index 713835a..5440159 100644
--- a/composer-bootstrap.php
+++ b/composer-bootstrap.php
@@ -1,4 +1,6 @@
 <?php
 require 'Composer/autoload.php';
-$fedoraClassLoader->addPrefix('Composer\\Test\\', __DIR__);
+/* \Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/'); broken for now */
+\Fedora\Autoloader\Autoload::addPsr4('Composer\\Test\\', __DIR__ . '/Composer/Test');
 require __DIR__.'/Composer/TestCase.php';
+
diff --git a/composer.spec b/composer.spec
index b450ee7..ef21b5a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    16422c4b1ac4286f7caecf5211136dc073191672
+%global gh_commit    5465af955800fa884a36f66ff65280584988efd0
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -51,7 +51,7 @@ BuildRequires:  php-zip
 #        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
 BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
 # For autoloader
-BuildRequires:  php-composer(symfony/class-loader)
+BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
 BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
 BuildRequires:  php-PsrLog          >= 1.0.0-8
@@ -103,7 +103,7 @@ Requires:       php-composer(symfony/filesystem)        <  4
 Requires:       php-zip
 Requires:       php-openssl
 # For our autoloader
-Requires:       php-composer(symfony/class-loader)
+Requires:       php-composer(fedora/autoloader)
 Requires:       php-seld-phar-utils >= 1.0.1
 Requires:       php-seld-cli-prompt >= 1.0.0-3
 Requires:       php-PsrLog          >= 1.0.0-8
@@ -229,6 +229,10 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Thu Nov  3 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-1
+- update to 1.2.2
+- switch from symfony/class-loader to fedora/autoloader
+
 * Mon Sep 12 2016 Remi Collet <remi@fedoraproject.org> - 1.2.1-1
 - update to 1.2.1
 
diff --git a/sources b/sources
index 475b435..3858650 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c096bd37ec8a1107edc3383962600d41  composer-1.2.1-16422c4.tar.gz
+c245b655f8755ab374879dbaace5067f  composer-1.2.2-5465af9.tar.gz

From 58e99ffe35d41a113ac84018f5e1d3d972974111 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 17 Nov 2016 17:52:37 +0100
Subject: [PATCH 042/269] add profile scripts so globally installed commands
 will be found in default user path #1394577

---
 composer.csh  |  9 +++++++++
 composer.sh   | 11 +++++++++++
 composer.spec | 14 +++++++++++++-
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 composer.csh
 create mode 100644 composer.sh

diff --git a/composer.csh b/composer.csh
new file mode 100644
index 0000000..b57b1d0
--- /dev/null
+++ b/composer.csh
@@ -0,0 +1,9 @@
+# Composer initialization script
+
+# Add path to commands installed using "composer global require ..."
+if ( ${euid} > 0 ) then
+  if ( "${path}" !~  *${HOME}/.composer/vendor/bin* ) then
+   set path = ( $path ${HOME}/.composer/vendor/bin )
+  endif
+endif
+
diff --git a/composer.sh b/composer.sh
new file mode 100644
index 0000000..c75753c
--- /dev/null
+++ b/composer.sh
@@ -0,0 +1,11 @@
+# Composer initialization script
+
+# Add path to commands installed using "composer global require ..."
+if [ "${EUID:-0}" != "0" ]; then
+  case :$PATH: in
+    *:${HOME}/.composer/vendor/bin:*) ;;
+    *) PATH=$PATH:${HOME}/.composer/vendor/bin ;;
+  esac
+  export PATH
+fi
+
diff --git a/composer.spec b/composer.spec
index ba63227..34bcdc7 100644
--- a/composer.spec
+++ b/composer.spec
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -26,6 +26,9 @@ URL:            https://getcomposer.org/
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
 Source1:        %{name}-autoload.php
 Source2:        %{name}-bootstrap.php
+# Profile scripts
+Source3:        %{name}.sh
+Source4:        %{name}.csh
 
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
@@ -184,6 +187,10 @@ if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
 
 %install
 
+: Profile scripts
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/
+
 : Library
 mkdir -p     %{buildroot}%{_datadir}/php
 cp -pr src/* %{buildroot}%{_datadir}/php
@@ -223,12 +230,17 @@ export BUILDROOT=%{buildroot}
 %license LICENSE
 %doc *.md doc
 %doc composer.json
+%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*
 %{_bindir}/%{name}
 %{_datadir}/php/Composer
 %{_datadir}/%{name}
 
 
 %changelog
+* Thu Nov 17 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-2
+- add profile scripts so globally installed commands
+  will be found in default user path #1394577
+
 * Thu Nov  3 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-1
 - update to 1.2.2
 

From 721784ce9c8afcc3bbac461099a01df1997e0429 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 1 Dec 2016 16:48:41 +0100
Subject: [PATCH 043/269] v1.2.3

---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b67535..e3f249f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ clog
 /composer-1.2.0-b49a006.tar.gz
 /composer-1.2.1-16422c4.tar.gz
 /composer-1.2.2-5465af9.tar.gz
+/composer-1.2.3-e7f1928.tar.gz
diff --git a/composer.spec b/composer.spec
index 34bcdc7..0f58612 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    5465af955800fa884a36f66ff65280584988efd0
+%global gh_commit    e7f19286a7e7f940950c9069a0f549d483c30ba7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,8 +16,8 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.2.3
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -237,6 +237,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 1.2.3-1
+- update to 1.2.3
+
 * Thu Nov 17 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-2
 - add profile scripts so globally installed commands
   will be found in default user path #1394577
diff --git a/sources b/sources
index 3858650..0ac6242 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c245b655f8755ab374879dbaace5067f  composer-1.2.2-5465af9.tar.gz
+7f61b95d9708ea1d66779be2d0c85c09  composer-1.2.3-e7f1928.tar.gz

From ef41bbabe59b12ffedb60dde9b1a70d1bcfce7a7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 1 Dec 2016 16:56:09 +0100
Subject: [PATCH 044/269] update to 1.2.3

- add profile scripts so globally installed commands
  will be found in default user path #1394577

(cherry picked from commit 6812674201247380f62fa8359d3a32906dd88547)
---
 .gitignore    |  1 +
 composer.csh  |  9 +++++++++
 composer.sh   | 11 +++++++++++
 composer.spec | 17 +++++++++++++++--
 sources       |  2 +-
 5 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 composer.csh
 create mode 100644 composer.sh

diff --git a/.gitignore b/.gitignore
index 8b67535..e3f249f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ clog
 /composer-1.2.0-b49a006.tar.gz
 /composer-1.2.1-16422c4.tar.gz
 /composer-1.2.2-5465af9.tar.gz
+/composer-1.2.3-e7f1928.tar.gz
diff --git a/composer.csh b/composer.csh
new file mode 100644
index 0000000..b57b1d0
--- /dev/null
+++ b/composer.csh
@@ -0,0 +1,9 @@
+# Composer initialization script
+
+# Add path to commands installed using "composer global require ..."
+if ( ${euid} > 0 ) then
+  if ( "${path}" !~  *${HOME}/.composer/vendor/bin* ) then
+   set path = ( $path ${HOME}/.composer/vendor/bin )
+  endif
+endif
+
diff --git a/composer.sh b/composer.sh
new file mode 100644
index 0000000..c75753c
--- /dev/null
+++ b/composer.sh
@@ -0,0 +1,11 @@
+# Composer initialization script
+
+# Add path to commands installed using "composer global require ..."
+if [ "${EUID:-0}" != "0" ]; then
+  case :$PATH: in
+    *:${HOME}/.composer/vendor/bin:*) ;;
+    *) PATH=$PATH:${HOME}/.composer/vendor/bin ;;
+  esac
+  export PATH
+fi
+
diff --git a/composer.spec b/composer.spec
index ef21b5a..b0372a4 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    5465af955800fa884a36f66ff65280584988efd0
+%global gh_commit    e7f19286a7e7f940950c9069a0f549d483c30ba7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.2.2
+Version:        1.2.3
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -26,6 +26,9 @@ URL:            https://getcomposer.org/
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
 Source1:        %{name}-autoload.php
 Source2:        %{name}-bootstrap.php
+# Profile scripts
+Source3:        %{name}.sh
+Source4:        %{name}.csh
 
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
@@ -184,6 +187,10 @@ if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
 
 %install
 
+: Profile scripts
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/
+
 : Library
 mkdir -p     %{buildroot}%{_datadir}/php
 cp -pr src/* %{buildroot}%{_datadir}/php
@@ -223,12 +230,18 @@ export BUILDROOT=%{buildroot}
 %license LICENSE
 %doc *.md doc
 %doc composer.json
+%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*
 %{_bindir}/%{name}
 %{_datadir}/php/Composer
 %{_datadir}/%{name}
 
 
 %changelog
+* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 1.2.3-1
+- update to 1.2.3
+- add profile scripts so globally installed commands
+  will be found in default user path #1394577
+
 * Thu Nov  3 2016 Remi Collet <remi@fedoraproject.org> - 1.2.2-1
 - update to 1.2.2
 - switch from symfony/class-loader to fedora/autoloader
diff --git a/sources b/sources
index 3858650..0ac6242 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c245b655f8755ab374879dbaace5067f  composer-1.2.2-5465af9.tar.gz
+7f61b95d9708ea1d66779be2d0c85c09  composer-1.2.3-e7f1928.tar.gz

From 30cfbb6d3b73b400f83df9797cd57d47cb786a88 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 7 Dec 2016 08:56:12 +0100
Subject: [PATCH 045/269] v1.2.4

---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e3f249f..f051af5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ clog
 /composer-1.2.1-16422c4.tar.gz
 /composer-1.2.2-5465af9.tar.gz
 /composer-1.2.3-e7f1928.tar.gz
+/composer-1.2.4-7895e4a.tar.gz
diff --git a/composer.spec b/composer.spec
index 0f58612..1bab8b0 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    e7f19286a7e7f940950c9069a0f549d483c30ba7
+%global gh_commit    7895e4a7e0e05b06e0ebfae96fc154c6a2ba75f0
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.2.3
+Version:        1.2.4
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -237,6 +237,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Wed Dec  7 2016 Remi Collet <remi@fedoraproject.org> - 1.2.4-1
+- update to 1.2.4
+
 * Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 1.2.3-1
 - update to 1.2.3
 
diff --git a/sources b/sources
index 0ac6242..766e476 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f61b95d9708ea1d66779be2d0c85c09  composer-1.2.3-e7f1928.tar.gz
+c99da49027f8666de6919d03eed74978  composer-1.2.4-7895e4a.tar.gz

From b529ebf38c29a09a39d1adfd83d208fef09213b5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 7 Dec 2016 08:56:12 +0100
Subject: [PATCH 046/269] v1.2.4

(cherry picked from commit 30cfbb6d3b73b400f83df9797cd57d47cb786a88)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e3f249f..f051af5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ clog
 /composer-1.2.1-16422c4.tar.gz
 /composer-1.2.2-5465af9.tar.gz
 /composer-1.2.3-e7f1928.tar.gz
+/composer-1.2.4-7895e4a.tar.gz
diff --git a/composer.spec b/composer.spec
index b0372a4..a6bc4ac 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    e7f19286a7e7f940950c9069a0f549d483c30ba7
+%global gh_commit    7895e4a7e0e05b06e0ebfae96fc154c6a2ba75f0
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.2.3
+Version:        1.2.4
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -237,6 +237,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Wed Dec  7 2016 Remi Collet <remi@fedoraproject.org> - 1.2.4-1
+- update to 1.2.4
+
 * Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 1.2.3-1
 - update to 1.2.3
 - add profile scripts so globally installed commands
diff --git a/sources b/sources
index 0ac6242..766e476 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f61b95d9708ea1d66779be2d0c85c09  composer-1.2.3-e7f1928.tar.gz
+c99da49027f8666de6919d03eed74978  composer-1.2.4-7895e4a.tar.gz

From e4bb2d5803a48aebbffed5816232db3fc7a79386 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 16 Dec 2016 06:43:46 +0100
Subject: [PATCH 047/269] fix BR for json-schema, FTBFS from Koschei

---
 composer.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 1bab8b0..43e80a5 100644
--- a/composer.spec
+++ b/composer.spec
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -36,6 +36,7 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
+BuildRequires:  php-composer(justinrainbow/json-schema) <  3
 BuildRequires:  php-composer(justinrainbow/json-schema) >= 2.0
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
@@ -237,6 +238,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Fri Dec 16 2016 Remi Collet <remi@fedoraproject.org> - 1.2.4-2
+- fix BR for json-schema, FTBFS from Koschei
+
 * Wed Dec  7 2016 Remi Collet <remi@fedoraproject.org> - 1.2.4-1
 - update to 1.2.4
 

From a7bdce1b90ac37803d888ec3fc457dbba43300b6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 24 Dec 2016 08:49:44 +0100
Subject: [PATCH 048/269] update to 1.3.0 raise dependency on symfony 2.7 allow
 justinrainbow/json-schema 4

---
 .gitignore             |  1 +
 composer-autoload.php  | 10 +++++-----
 composer-bootstrap.php |  3 +--
 composer-rpm.patch     | 28 ++++++++++++++--------------
 composer.spec          | 32 ++++++++++++++++++--------------
 sources                |  2 +-
 6 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index f051af5..8a68ccd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ clog
 /composer-1.2.2-5465af9.tar.gz
 /composer-1.2.3-e7f1928.tar.gz
 /composer-1.2.4-7895e4a.tar.gz
+/composer-1.3.0RC-a72a8ca.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index c103501..e36e932 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -2,9 +2,7 @@
 /* Autoloader for composer/composer and its dependencies */
 
 $vendorDir = '/usr/share/php';
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
+require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__);
 
@@ -17,7 +15,9 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
 	$vendorDir . '/Composer/CaBundle/autoload.php',
 	$vendorDir . '/Composer/Spdx/autoload.php',
 	$vendorDir . '/Composer/Semver/autoload.php',
-	$vendorDir . '/JsonSchema2/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
-));
+	array(
+		$vendorDir . '/JsonSchema4/autoload.php',
+		$vendorDir . '/JsonSchema2/autoload.php',
+)));
 
diff --git a/composer-bootstrap.php b/composer-bootstrap.php
index 5440159..279f1cc 100644
--- a/composer-bootstrap.php
+++ b/composer-bootstrap.php
@@ -1,6 +1,5 @@
 <?php
 require 'Composer/autoload.php';
-/* \Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/'); broken for now */
-\Fedora\Autoloader\Autoload::addPsr4('Composer\\Test\\', __DIR__ . '/Composer/Test');
+\Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/');
 require __DIR__.'/Composer/TestCase.php';
 
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 2e2d330..1cdfd7d 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2016-04-29 18:32:14.000000000 +0200
-+++ ./bin/composer	2016-04-30 10:07:31.835289957 +0200
+--- ./bin/composer.rpm	2016-12-12 10:30:58.174009561 +0100
++++ ./bin/composer	2016-12-12 10:32:17.465427241 +0100
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -8,12 +8,12 @@ diff -up ./bin/composer.rpm ./bin/composer
 -require __DIR__.'/../src/bootstrap.php';
 +require '/usr/share/php/Composer/autoload.php';
  
- use Composer\Console\Application;
- 
+ use Composer\Factory;
+ use Composer\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-04-30 10:07:31.836289961 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-04-30 10:08:50.489640789 +0200
-@@ -288,7 +288,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-12-11 17:04:50.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-12-12 10:30:58.175009567 +0100
+@@ -305,7 +305,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2016-04-29 18:32:14.000000000 +0200
-+++ ./src/Composer/Compiler.php	2016-04-30 10:07:31.836289961 +0200
+--- ./src/Composer/Compiler.php.rpm	2016-12-11 17:04:50.000000000 +0100
++++ ./src/Composer/Compiler.php	2016-12-12 10:30:58.175009567 +0100
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2016-04-29 18:32:14.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2016-04-30 10:07:31.836289961 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2016-12-11 17:04:50.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2016-12-12 10:30:58.175009567 +0100
 @@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
@@ -47,9 +47,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          if ($schema === self::LAX_SCHEMA) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-04-29 18:32:14.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-04-30 10:07:31.836289961 +0200
-@@ -87,7 +87,7 @@ class ComposerSchemaTest extends \PHPUni
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-12-11 17:04:50.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-12-12 10:30:58.175009567 +0100
+@@ -95,7 +95,7 @@ class ComposerSchemaTest extends \PHPUni
  
      private function check($json)
      {
diff --git a/composer.spec b/composer.spec
index 43e80a5..fdf2be3 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    7895e4a7e0e05b06e0ebfae96fc154c6a2ba75f0
+%global gh_commit    e53f9e5381e70f76e098136343e27d92601eade7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,8 +16,8 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.2.4
-Release:        2%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -36,7 +36,6 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-composer(justinrainbow/json-schema) <  3
 BuildRequires:  php-composer(justinrainbow/json-schema) >= 2.0
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
@@ -63,22 +62,22 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^1.6 || ^2.0",
+#        "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.0",
 #        "seld/jsonlint": "~1.4",
-#        "symfony/console": "^2.5 || ^3.0",
-#        "symfony/finder": "^2.2 || ^3.0",
-#        "symfony/process": "^2.1 || ^3.0",
-#        "symfony/filesystem": "^2.5 || ^3.0",
+#        "symfony/console": "^2.7 || ^3.0",
+#        "symfony/finder": "^2.7 || ^3.0",
+#        "symfony/process": "^2.7 || ^3.0",
+#        "symfony/filesystem": "^2.7 || ^3.0",
 #        "seld/phar-utils": "^1.0",
 #        "seld/cli-prompt": "^1.0",
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-composer(justinrainbow/json-schema) >= 2.0
-Requires:       php-composer(justinrainbow/json-schema) <  3
+Requires:       php-composer(justinrainbow/json-schema) <  5
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -93,13 +92,13 @@ Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(psr/log)                   >= 1.0
 Requires:       php-composer(psr/log)                   <  2
-Requires:       php-composer(symfony/console)           >= 2.5
+Requires:       php-composer(symfony/console)           >= 2.7
 Requires:       php-composer(symfony/console)           <  4
-Requires:       php-composer(symfony/finder)            >= 2.2
+Requires:       php-composer(symfony/finder)            >= 2.7
 Requires:       php-composer(symfony/finder)            <  4
-Requires:       php-composer(symfony/process)           >= 2.1
+Requires:       php-composer(symfony/process)           >= 2.7
 Requires:       php-composer(symfony/process)           <  4
-Requires:       php-composer(symfony/filesystem)        >= 2.5
+Requires:       php-composer(symfony/filesystem)        >= 2.7
 Requires:       php-composer(symfony/filesystem)        <  4
 # From composer.json, suggest
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
@@ -238,6 +237,11 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Sat Dec 24 2016 Remi Collet <remi@fedoraproject.org> - 1.3.0-1
+- update to 1.3.0
+- raise dependency on symfony 2.7
+- allow justinrainbow/json-schema 4
+
 * Fri Dec 16 2016 Remi Collet <remi@fedoraproject.org> - 1.2.4-2
 - fix BR for json-schema, FTBFS from Koschei
 
diff --git a/sources b/sources
index 766e476..2252b86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c99da49027f8666de6919d03eed74978  composer-1.2.4-7895e4a.tar.gz
+SHA512 (composer-1.3.0RC-a72a8ca.tar.gz) = d97e38117074507e59e7a88859740859178d543382fc585e8fb4d3765a40381d06fc4ff01ed0a247b040a011d6371469852ac0b7ca01d19ec11c9088e0f5a6bf

From b8744858ce50f1e7d864183320a10533875f6569 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 24 Dec 2016 08:53:44 +0100
Subject: [PATCH 049/269] v1.3.0 souces

---
 .gitignore | 26 +-------------------------
 sources    |  2 +-
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8a68ccd..5248737 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,2 @@
 clog
-/composer-1.0.0-00c2679.tar.gz
-/composer-1.0.0-c83650f.tar.gz
-/composer-1.0.0-9f6fdfd.tar.gz
-/composer-1.0.0-7a9eb02.tar.gz
-/composer-1.0.0-a54f84f.tar.gz
-/composer-1.0.0-5a5088e.tar.gz
-/composer-1.0.0-cd9054c.tar.gz
-/composer-1.0.0-64b0d72.tar.gz
-/composer-1.0.0-4c0e163.tar.gz
-/composer-1.0.0-5cb2b52.tar.gz
-/composer-1.0.0-91d92c4.tar.gz
-/composer-1.0.0-32df3aa.tar.gz
-/composer-1.0.1-de0e25b.tar.gz
-/composer-1.0.2-a083aa5.tar.gz
-/composer-1.0.3-a4a0546.tar.gz
-/composer-1.1.1-48156b0.tar.gz
-/composer.spec
-/composer-1.1.2-b2cf67b.tar.gz
-/composer-1.1.3-30ab6f1.tar.gz
-/composer-1.2.0-b49a006.tar.gz
-/composer-1.2.1-16422c4.tar.gz
-/composer-1.2.2-5465af9.tar.gz
-/composer-1.2.3-e7f1928.tar.gz
-/composer-1.2.4-7895e4a.tar.gz
-/composer-1.3.0RC-a72a8ca.tar.gz
+/composer-1.3.0-e53f9e5.tar.gz
diff --git a/sources b/sources
index 2252b86..466277d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.3.0RC-a72a8ca.tar.gz) = d97e38117074507e59e7a88859740859178d543382fc585e8fb4d3765a40381d06fc4ff01ed0a247b040a011d6371469852ac0b7ca01d19ec11c9088e0f5a6bf
+SHA512 (composer-1.3.0-e53f9e5.tar.gz) = 9c5707e63fba679a0db23e61074642d23c0b4620568a9ecf0154cb7d6d1fa1364bf2826afffb26ccd90012f6086b464be13f5cc27a333b9cffbf9d245448d254

From c0933d50adeda6469a5ee5d651503015f021e86d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 24 Dec 2016 09:18:55 +0100
Subject: [PATCH 050/269] drop online tests

---
 composer.spec | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/composer.spec b/composer.spec
index fdf2be3..1cf07d0 100644
--- a/composer.spec
+++ b/composer.spec
@@ -208,11 +208,8 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 %check
 %if %{with_tests}
-%if 0%{?rhel} == 5
-rm tests/Composer/Test/Downloader/XzDownloaderTest.php
-%endif
-sed -e 's/testDispatcherCanConvertScriptEventToCommandEventForListener/SKIP1/' \
-    -i tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
+: Online tests
+rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
 : Ensure not used
 rm -rf res

From 66dfe3538f1aefcf2388e25cb21be3520c127616 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 24 Dec 2016 08:55:38 +0100
Subject: [PATCH 051/269] update to 1.3.0 raise dependency on symfony 2.7 allow
 justinrainbow/json-schema 4

(cherry picked from commit e43c2f2a891321ad1b91a18f0089a15a7710f3a0)
---
 .gitignore             | 25 +------------------------
 composer-autoload.php  | 10 +++++-----
 composer-bootstrap.php |  3 +--
 composer-rpm.patch     | 28 ++++++++++++++--------------
 composer.spec          | 29 +++++++++++++++++------------
 sources                |  2 +-
 6 files changed, 39 insertions(+), 58 deletions(-)

diff --git a/.gitignore b/.gitignore
index f051af5..5248737 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,2 @@
 clog
-/composer-1.0.0-00c2679.tar.gz
-/composer-1.0.0-c83650f.tar.gz
-/composer-1.0.0-9f6fdfd.tar.gz
-/composer-1.0.0-7a9eb02.tar.gz
-/composer-1.0.0-a54f84f.tar.gz
-/composer-1.0.0-5a5088e.tar.gz
-/composer-1.0.0-cd9054c.tar.gz
-/composer-1.0.0-64b0d72.tar.gz
-/composer-1.0.0-4c0e163.tar.gz
-/composer-1.0.0-5cb2b52.tar.gz
-/composer-1.0.0-91d92c4.tar.gz
-/composer-1.0.0-32df3aa.tar.gz
-/composer-1.0.1-de0e25b.tar.gz
-/composer-1.0.2-a083aa5.tar.gz
-/composer-1.0.3-a4a0546.tar.gz
-/composer-1.1.1-48156b0.tar.gz
-/composer.spec
-/composer-1.1.2-b2cf67b.tar.gz
-/composer-1.1.3-30ab6f1.tar.gz
-/composer-1.2.0-b49a006.tar.gz
-/composer-1.2.1-16422c4.tar.gz
-/composer-1.2.2-5465af9.tar.gz
-/composer-1.2.3-e7f1928.tar.gz
-/composer-1.2.4-7895e4a.tar.gz
+/composer-1.3.0-e53f9e5.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index c103501..e36e932 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -2,9 +2,7 @@
 /* Autoloader for composer/composer and its dependencies */
 
 $vendorDir = '/usr/share/php';
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
+require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__);
 
@@ -17,7 +15,9 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
 	$vendorDir . '/Composer/CaBundle/autoload.php',
 	$vendorDir . '/Composer/Spdx/autoload.php',
 	$vendorDir . '/Composer/Semver/autoload.php',
-	$vendorDir . '/JsonSchema2/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
-));
+	array(
+		$vendorDir . '/JsonSchema4/autoload.php',
+		$vendorDir . '/JsonSchema2/autoload.php',
+)));
 
diff --git a/composer-bootstrap.php b/composer-bootstrap.php
index 5440159..279f1cc 100644
--- a/composer-bootstrap.php
+++ b/composer-bootstrap.php
@@ -1,6 +1,5 @@
 <?php
 require 'Composer/autoload.php';
-/* \Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/'); broken for now */
-\Fedora\Autoloader\Autoload::addPsr4('Composer\\Test\\', __DIR__ . '/Composer/Test');
+\Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/');
 require __DIR__.'/Composer/TestCase.php';
 
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 2e2d330..1cdfd7d 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2016-04-29 18:32:14.000000000 +0200
-+++ ./bin/composer	2016-04-30 10:07:31.835289957 +0200
+--- ./bin/composer.rpm	2016-12-12 10:30:58.174009561 +0100
++++ ./bin/composer	2016-12-12 10:32:17.465427241 +0100
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -8,12 +8,12 @@ diff -up ./bin/composer.rpm ./bin/composer
 -require __DIR__.'/../src/bootstrap.php';
 +require '/usr/share/php/Composer/autoload.php';
  
- use Composer\Console\Application;
- 
+ use Composer\Factory;
+ use Composer\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-04-30 10:07:31.836289961 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-04-30 10:08:50.489640789 +0200
-@@ -288,7 +288,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-12-11 17:04:50.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-12-12 10:30:58.175009567 +0100
+@@ -305,7 +305,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2016-04-29 18:32:14.000000000 +0200
-+++ ./src/Composer/Compiler.php	2016-04-30 10:07:31.836289961 +0200
+--- ./src/Composer/Compiler.php.rpm	2016-12-11 17:04:50.000000000 +0100
++++ ./src/Composer/Compiler.php	2016-12-12 10:30:58.175009567 +0100
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2016-04-29 18:32:14.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2016-04-30 10:07:31.836289961 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2016-12-11 17:04:50.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2016-12-12 10:30:58.175009567 +0100
 @@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
@@ -47,9 +47,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          if ($schema === self::LAX_SCHEMA) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-04-29 18:32:14.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-04-30 10:07:31.836289961 +0200
-@@ -87,7 +87,7 @@ class ComposerSchemaTest extends \PHPUni
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-12-11 17:04:50.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-12-12 10:30:58.175009567 +0100
+@@ -95,7 +95,7 @@ class ComposerSchemaTest extends \PHPUni
  
      private function check($json)
      {
diff --git a/composer.spec b/composer.spec
index a6bc4ac..8b23892 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    7895e4a7e0e05b06e0ebfae96fc154c6a2ba75f0
+%global gh_commit    e53f9e5381e70f76e098136343e27d92601eade7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.2.4
+Version:        1.3.0
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -62,22 +62,22 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^1.6 || ^2.0",
+#        "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.0",
 #        "seld/jsonlint": "~1.4",
-#        "symfony/console": "^2.5 || ^3.0",
-#        "symfony/finder": "^2.2 || ^3.0",
-#        "symfony/process": "^2.1 || ^3.0",
-#        "symfony/filesystem": "^2.5 || ^3.0",
+#        "symfony/console": "^2.7 || ^3.0",
+#        "symfony/finder": "^2.7 || ^3.0",
+#        "symfony/process": "^2.7 || ^3.0",
+#        "symfony/filesystem": "^2.7 || ^3.0",
 #        "seld/phar-utils": "^1.0",
 #        "seld/cli-prompt": "^1.0",
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-composer(justinrainbow/json-schema) >= 2.0
-Requires:       php-composer(justinrainbow/json-schema) <  3
+Requires:       php-composer(justinrainbow/json-schema) <  5
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -92,13 +92,13 @@ Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(psr/log)                   >= 1.0
 Requires:       php-composer(psr/log)                   <  2
-Requires:       php-composer(symfony/console)           >= 2.5
+Requires:       php-composer(symfony/console)           >= 2.7
 Requires:       php-composer(symfony/console)           <  4
-Requires:       php-composer(symfony/finder)            >= 2.2
+Requires:       php-composer(symfony/finder)            >= 2.7
 Requires:       php-composer(symfony/finder)            <  4
-Requires:       php-composer(symfony/process)           >= 2.1
+Requires:       php-composer(symfony/process)           >= 2.7
 Requires:       php-composer(symfony/process)           <  4
-Requires:       php-composer(symfony/filesystem)        >= 2.5
+Requires:       php-composer(symfony/filesystem)        >= 2.7
 Requires:       php-composer(symfony/filesystem)        <  4
 # From composer.json, suggest
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
@@ -237,6 +237,11 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Sat Dec 24 2016 Remi Collet <remi@fedoraproject.org> - 1.3.0-1
+- update to 1.3.0
+- raise dependency on symfony 2.7
+- allow justinrainbow/json-schema 4
+
 * Wed Dec  7 2016 Remi Collet <remi@fedoraproject.org> - 1.2.4-1
 - update to 1.2.4
 
diff --git a/sources b/sources
index 766e476..466277d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c99da49027f8666de6919d03eed74978  composer-1.2.4-7895e4a.tar.gz
+SHA512 (composer-1.3.0-e53f9e5.tar.gz) = 9c5707e63fba679a0db23e61074642d23c0b4620568a9ecf0154cb7d6d1fa1364bf2826afffb26ccd90012f6086b464be13f5cc27a333b9cffbf9d245448d254

From 7a33b073e5da584bd14fab1d78e39ff83a89e98f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 24 Dec 2016 09:18:55 +0100
Subject: [PATCH 052/269] drop online tests

(cherry picked from commit c0933d50adeda6469a5ee5d651503015f021e86d)
---
 composer.spec | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/composer.spec b/composer.spec
index 8b23892..6e1738a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -208,11 +208,8 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 %check
 %if %{with_tests}
-%if 0%{?rhel} == 5
-rm tests/Composer/Test/Downloader/XzDownloaderTest.php
-%endif
-sed -e 's/testDispatcherCanConvertScriptEventToCommandEventForListener/SKIP1/' \
-    -i tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
+: Online tests
+rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
 : Ensure not used
 rm -rf res

From eca3faa17165c31e98d0a0c2529cb559c16652e8 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 7 Jan 2017 19:27:08 +0100
Subject: [PATCH 053/269] v1.3.1

---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5248737..9966479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 clog
 /composer-1.3.0-e53f9e5.tar.gz
+/composer-1.3.1-91dbca5.tar.gz
diff --git a/composer.spec b/composer.spec
index 1cf07d0..212ed64 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2016 Remi Collet
+# Copyright (c) 2015-2017 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    e53f9e5381e70f76e098136343e27d92601eade7
+%global gh_commit    91dbca556764dcece45e1ba3aab14de2deaa9fec
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Sat Jan  7 2017 Remi Collet <remi@fedoraproject.org> - 1.3.1-1
+- update to 1.3.1
+
 * Sat Dec 24 2016 Remi Collet <remi@fedoraproject.org> - 1.3.0-1
 - update to 1.3.0
 - raise dependency on symfony 2.7
diff --git a/sources b/sources
index 466277d..be852ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.3.0-e53f9e5.tar.gz) = 9c5707e63fba679a0db23e61074642d23c0b4620568a9ecf0154cb7d6d1fa1364bf2826afffb26ccd90012f6086b464be13f5cc27a333b9cffbf9d245448d254
+SHA512 (composer-1.3.1-91dbca5.tar.gz) = 8a91f391fdbf3601b81a4531b041755612fe282c10a8839ab82c6f49493e08c6a9b0b298a459b1e92be2df1456fe0bc2ae931dfe6184e9c20b25a37a75810de8

From 10e94d13ab1a7e90bdde770a7351491468a78077 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 7 Jan 2017 19:27:08 +0100
Subject: [PATCH 054/269] v1.3.1

(cherry picked from commit eca3faa17165c31e98d0a0c2529cb559c16652e8)
---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5248737..9966479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 clog
 /composer-1.3.0-e53f9e5.tar.gz
+/composer-1.3.1-91dbca5.tar.gz
diff --git a/composer.spec b/composer.spec
index 6e1738a..a059610 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2016 Remi Collet
+# Copyright (c) 2015-2017 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    e53f9e5381e70f76e098136343e27d92601eade7
+%global gh_commit    91dbca556764dcece45e1ba3aab14de2deaa9fec
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Sat Jan  7 2017 Remi Collet <remi@fedoraproject.org> - 1.3.1-1
+- update to 1.3.1
+
 * Sat Dec 24 2016 Remi Collet <remi@fedoraproject.org> - 1.3.0-1
 - update to 1.3.0
 - raise dependency on symfony 2.7
diff --git a/sources b/sources
index 466277d..be852ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.3.0-e53f9e5.tar.gz) = 9c5707e63fba679a0db23e61074642d23c0b4620568a9ecf0154cb7d6d1fa1364bf2826afffb26ccd90012f6086b464be13f5cc27a333b9cffbf9d245448d254
+SHA512 (composer-1.3.1-91dbca5.tar.gz) = 8a91f391fdbf3601b81a4531b041755612fe282c10a8839ab82c6f49493e08c6a9b0b298a459b1e92be2df1456fe0bc2ae931dfe6184e9c20b25a37a75810de8

From b0b7b563f314e4f571dde876a6afabf5b3ef7e3b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 28 Jan 2017 06:24:40 +0100
Subject: [PATCH 055/269] v1.3.2

---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9966479..ddf30aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 clog
 /composer-1.3.0-e53f9e5.tar.gz
 /composer-1.3.1-91dbca5.tar.gz
+/composer-1.3.2-e7569ed.tar.gz
diff --git a/composer.spec b/composer.spec
index a059610..481e2a0 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    91dbca556764dcece45e1ba3aab14de2deaa9fec
+%global gh_commit    e7569edb4a5eadcbb2e4ad5ed753282260f281df
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Sat Jan 28 2017 Remi Collet <remi@fedoraproject.org> - 1.3.2-1
+- update to 1.3.2
+
 * Sat Jan  7 2017 Remi Collet <remi@fedoraproject.org> - 1.3.1-1
 - update to 1.3.1
 
diff --git a/sources b/sources
index be852ce..8f84b8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.3.1-91dbca5.tar.gz) = 8a91f391fdbf3601b81a4531b041755612fe282c10a8839ab82c6f49493e08c6a9b0b298a459b1e92be2df1456fe0bc2ae931dfe6184e9c20b25a37a75810de8
+SHA512 (composer-1.3.2-e7569ed.tar.gz) = f8d0a1331339ac87e6f04939d234761dd3624732bb14271f9989ea143a6393ce60ce3e9a4d0d9004474ebcd350a838170ff28236716da1c7a0020020913d063f

From 85f786c15d20c96323b9367878466c78121a11b7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 28 Jan 2017 06:24:40 +0100
Subject: [PATCH 056/269] v1.3.2

(cherry picked from commit b0b7b563f314e4f571dde876a6afabf5b3ef7e3b)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9966479..ddf30aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 clog
 /composer-1.3.0-e53f9e5.tar.gz
 /composer-1.3.1-91dbca5.tar.gz
+/composer-1.3.2-e7569ed.tar.gz
diff --git a/composer.spec b/composer.spec
index 212ed64..01e6329 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    91dbca556764dcece45e1ba3aab14de2deaa9fec
+%global gh_commit    e7569edb4a5eadcbb2e4ad5ed753282260f281df
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.3.1
+Version:        1.3.2
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Sat Jan 28 2017 Remi Collet <remi@fedoraproject.org> - 1.3.2-1
+- update to 1.3.2
+
 * Sat Jan  7 2017 Remi Collet <remi@fedoraproject.org> - 1.3.1-1
 - update to 1.3.1
 
diff --git a/sources b/sources
index be852ce..8f84b8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.3.1-91dbca5.tar.gz) = 8a91f391fdbf3601b81a4531b041755612fe282c10a8839ab82c6f49493e08c6a9b0b298a459b1e92be2df1456fe0bc2ae931dfe6184e9c20b25a37a75810de8
+SHA512 (composer-1.3.2-e7569ed.tar.gz) = f8d0a1331339ac87e6f04939d234761dd3624732bb14271f9989ea143a6393ce60ce3e9a4d0d9004474ebcd350a838170ff28236716da1c7a0020020913d063f

From aca9909854dcfdb5d711b071247433627caab06b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 07:49:15 +0000
Subject: [PATCH 057/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 01e6329..4a54147 100644
--- a/composer.spec
+++ b/composer.spec
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Sat Jan 28 2017 Remi Collet <remi@fedoraproject.org> - 1.3.2-1
 - update to 1.3.2
 

From 030be2f9ed447ea3e886970a181961911a9f46d5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 8 Mar 2017 13:06:35 +0100
Subject: [PATCH 058/269] v1.3.3

---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ddf30aa..668baf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ clog
 /composer-1.3.0-e53f9e5.tar.gz
 /composer-1.3.1-91dbca5.tar.gz
 /composer-1.3.2-e7569ed.tar.gz
+/composer-1.3.3-989d687.tar.gz
diff --git a/composer.spec b/composer.spec
index 4a54147..36ddcff 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    e7569edb4a5eadcbb2e4ad5ed753282260f281df
+%global gh_commit    989d68725bc8ebf97e795d4feb386f52adb096e3
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,8 +16,8 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.3.2
-Release:        2%{?dist}
+Version:        1.3.3
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Wed Mar  8 2017 Remi Collet <remi@remirepo.net> - 1.3.3-1
+- Update to 1.3.3
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 8f84b8a..7f3a0a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.3.2-e7569ed.tar.gz) = f8d0a1331339ac87e6f04939d234761dd3624732bb14271f9989ea143a6393ce60ce3e9a4d0d9004474ebcd350a838170ff28236716da1c7a0020020913d063f
+SHA512 (composer-1.3.3-989d687.tar.gz) = 343706f1df3145ba17af518efd504b531b9a55fcc39151e1764e92b8845d6990a171494e9ad155c7201bc6ed1ec50b91301941bfb875dfd9ce8a30d39bb8091a

From 651cf5faf17e68386034d978a2b8b07fe8547d62 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 8 Mar 2017 13:06:35 +0100
Subject: [PATCH 059/269] v1.3.3

(cherry picked from commit 030be2f9ed447ea3e886970a181961911a9f46d5)
(cherry picked from commit e1d773c231b2dbeb36a0526cc233459555836aee)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ddf30aa..668baf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ clog
 /composer-1.3.0-e53f9e5.tar.gz
 /composer-1.3.1-91dbca5.tar.gz
 /composer-1.3.2-e7569ed.tar.gz
+/composer-1.3.3-989d687.tar.gz
diff --git a/composer.spec b/composer.spec
index 481e2a0..0b56359 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    e7569edb4a5eadcbb2e4ad5ed753282260f281df
+%global gh_commit    989d68725bc8ebf97e795d4feb386f52adb096e3
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.3.2
+Version:        1.3.3
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Wed Mar  8 2017 Remi Collet <remi@remirepo.net> - 1.3.3-1
+- Update to 1.3.3
+
 * Sat Jan 28 2017 Remi Collet <remi@fedoraproject.org> - 1.3.2-1
 - update to 1.3.2
 
diff --git a/sources b/sources
index 8f84b8a..7f3a0a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.3.2-e7569ed.tar.gz) = f8d0a1331339ac87e6f04939d234761dd3624732bb14271f9989ea143a6393ce60ce3e9a4d0d9004474ebcd350a838170ff28236716da1c7a0020020913d063f
+SHA512 (composer-1.3.3-989d687.tar.gz) = 343706f1df3145ba17af518efd504b531b9a55fcc39151e1764e92b8845d6990a171494e9ad155c7201bc6ed1ec50b91301941bfb875dfd9ce8a30d39bb8091a

From aa6ca2cfd10265225caa5208debd46418fe232a5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 9 Mar 2017 06:51:17 +0100
Subject: [PATCH 060/269] Update to 1.4.0 raise dependency on
 justinrainbow/json-schema version 3 to 5

---
 .gitignore            |  1 +
 composer-autoload.php |  2 +-
 composer-rpm.patch    | 35 ++++++++++++++++++-----------------
 composer.spec         | 16 ++++++++++------
 sources               |  2 +-
 5 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 668baf2..57da520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clog
 /composer-1.3.1-91dbca5.tar.gz
 /composer-1.3.2-e7569ed.tar.gz
 /composer-1.3.3-989d687.tar.gz
+/composer-1.4.0-b19655f.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index e36e932..f66b4f8 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -17,7 +17,7 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 	$vendorDir . '/Composer/Semver/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
 	array(
+		$vendorDir . '/JsonSchema5/autoload.php',
 		$vendorDir . '/JsonSchema4/autoload.php',
-		$vendorDir . '/JsonSchema2/autoload.php',
 )));
 
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 1cdfd7d..9b896a2 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2016-12-12 10:30:58.174009561 +0100
-+++ ./bin/composer	2016-12-12 10:32:17.465427241 +0100
+--- ./bin/composer.rpm	2017-03-08 17:51:24.000000000 +0100
++++ ./bin/composer	2017-03-08 19:16:24.206124958 +0100
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -11,8 +11,8 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Factory;
  use Composer\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-12-11 17:04:50.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-12-12 10:30:58.175009567 +0100
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2017-03-08 17:51:24.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2017-03-08 19:16:24.207124963 +0100
 @@ -305,7 +305,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2016-12-11 17:04:50.000000000 +0100
-+++ ./src/Composer/Compiler.php	2016-12-12 10:30:58.175009567 +0100
+--- ./src/Composer/Compiler.php.rpm	2017-03-08 17:51:24.000000000 +0100
++++ ./src/Composer/Compiler.php	2017-03-08 19:16:24.207124963 +0100
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,26 +35,27 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2016-12-11 17:04:50.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2016-12-12 10:30:58.175009567 +0100
+--- ./src/Composer/Json/JsonFile.php.rpm	2017-03-08 19:16:24.207124963 +0100
++++ ./src/Composer/Json/JsonFile.php	2017-03-08 19:17:35.148449586 +0100
 @@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
  
 -        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
 +        $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
-         $schemaData = json_decode(file_get_contents($schemaFile));
  
-         if ($schema === self::LAX_SCHEMA) {
+         // Prepend with file:// only when not using a special schema already (e.g. in the phar)
+         if (false === strpos($schemaFile, '://')) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-12-11 17:04:50.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-12-12 10:30:58.175009567 +0100
-@@ -95,7 +95,7 @@ class ComposerSchemaTest extends \PHPUni
- 
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2017-03-08 19:16:24.207124963 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2017-03-08 19:19:02.243848127 +0100
+@@ -96,7 +96,8 @@ class ComposerSchemaTest extends \PHPUni
      private function check($json)
      {
--        $schema = json_decode(file_get_contents(__DIR__ . '/../../../../res/composer-schema.json'));
-+        $schema = json_decode(file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'));
          $validator = new Validator();
-         $validator->check(json_decode($json), $schema);
+-        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json'));
++        $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
++        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f));
  
+         if (!$validator->isValid()) {
+             $errors = $validator->getErrors();
diff --git a/composer.spec b/composer.spec
index 36ddcff..b87fa76 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    989d68725bc8ebf97e795d4feb386f52adb096e3
+%global gh_commit    b19655f1304a3365213204bcf9a9b84476d0d265
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.3.3
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -36,7 +36,7 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-composer(justinrainbow/json-schema) >= 2.0
+BuildRequires:  php-composer(justinrainbow/json-schema) >= 3.0
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
@@ -62,7 +62,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0",
+#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.0",
@@ -76,8 +76,8 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-composer(justinrainbow/json-schema) >= 2.0
-Requires:       php-composer(justinrainbow/json-schema) <  5
+Requires:       php-composer(justinrainbow/json-schema) >= 3.0
+Requires:       php-composer(justinrainbow/json-schema) <  6
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -234,6 +234,10 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Wed Mar  8 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1
+- Update to 1.4.0
+- raise dependency on justinrainbow/json-schema version 3 to 5
+
 * Wed Mar  8 2017 Remi Collet <remi@remirepo.net> - 1.3.3-1
 - Update to 1.3.3
 
diff --git a/sources b/sources
index 7f3a0a4..d5af73c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.3.3-989d687.tar.gz) = 343706f1df3145ba17af518efd504b531b9a55fcc39151e1764e92b8845d6990a171494e9ad155c7201bc6ed1ec50b91301941bfb875dfd9ce8a30d39bb8091a
+SHA512 (composer-1.4.0-b19655f.tar.gz) = be4f877a8e6b744eb6b09e7dcf7963f36de0e5a4adcbfa94e12ad201d336342faa511e1afa6e70660c43ef70915c89211893d3949c8c4d27f688d910ca2b8434

From 4c52ab5d417a74c4fdc0f5c5b3f198a1f255d63d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 9 Mar 2017 06:51:17 +0100
Subject: [PATCH 061/269] Update to 1.4.0 raise dependency on
 justinrainbow/json-schema version 3 to 5

(cherry picked from commit aa6ca2cfd10265225caa5208debd46418fe232a5)
---
 .gitignore            |  1 +
 composer-autoload.php |  2 +-
 composer-rpm.patch    | 35 ++++++++++++++++++-----------------
 composer.spec         | 16 ++++++++++------
 sources               |  2 +-
 5 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 668baf2..57da520 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clog
 /composer-1.3.1-91dbca5.tar.gz
 /composer-1.3.2-e7569ed.tar.gz
 /composer-1.3.3-989d687.tar.gz
+/composer-1.4.0-b19655f.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index e36e932..f66b4f8 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -17,7 +17,7 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 	$vendorDir . '/Composer/Semver/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
 	array(
+		$vendorDir . '/JsonSchema5/autoload.php',
 		$vendorDir . '/JsonSchema4/autoload.php',
-		$vendorDir . '/JsonSchema2/autoload.php',
 )));
 
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 1cdfd7d..9b896a2 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2016-12-12 10:30:58.174009561 +0100
-+++ ./bin/composer	2016-12-12 10:32:17.465427241 +0100
+--- ./bin/composer.rpm	2017-03-08 17:51:24.000000000 +0100
++++ ./bin/composer	2017-03-08 19:16:24.206124958 +0100
 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
@@ -11,8 +11,8 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Factory;
  use Composer\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2016-12-11 17:04:50.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2016-12-12 10:30:58.175009567 +0100
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2017-03-08 17:51:24.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2017-03-08 19:16:24.207124963 +0100
 @@ -305,7 +305,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2016-12-11 17:04:50.000000000 +0100
-+++ ./src/Composer/Compiler.php	2016-12-12 10:30:58.175009567 +0100
+--- ./src/Composer/Compiler.php.rpm	2017-03-08 17:51:24.000000000 +0100
++++ ./src/Composer/Compiler.php	2017-03-08 19:16:24.207124963 +0100
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,26 +35,27 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2016-12-11 17:04:50.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2016-12-12 10:30:58.175009567 +0100
+--- ./src/Composer/Json/JsonFile.php.rpm	2017-03-08 19:16:24.207124963 +0100
++++ ./src/Composer/Json/JsonFile.php	2017-03-08 19:17:35.148449586 +0100
 @@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
  
 -        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
 +        $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
-         $schemaData = json_decode(file_get_contents($schemaFile));
  
-         if ($schema === self::LAX_SCHEMA) {
+         // Prepend with file:// only when not using a special schema already (e.g. in the phar)
+         if (false === strpos($schemaFile, '://')) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2016-12-11 17:04:50.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2016-12-12 10:30:58.175009567 +0100
-@@ -95,7 +95,7 @@ class ComposerSchemaTest extends \PHPUni
- 
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2017-03-08 19:16:24.207124963 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2017-03-08 19:19:02.243848127 +0100
+@@ -96,7 +96,8 @@ class ComposerSchemaTest extends \PHPUni
      private function check($json)
      {
--        $schema = json_decode(file_get_contents(__DIR__ . '/../../../../res/composer-schema.json'));
-+        $schema = json_decode(file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'));
          $validator = new Validator();
-         $validator->check(json_decode($json), $schema);
+-        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json'));
++        $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
++        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f));
  
+         if (!$validator->isValid()) {
+             $errors = $validator->getErrors();
diff --git a/composer.spec b/composer.spec
index 0b56359..f84c2f7 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    989d68725bc8ebf97e795d4feb386f52adb096e3
+%global gh_commit    b19655f1304a3365213204bcf9a9b84476d0d265
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.3.3
+Version:        1.4.0
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -36,7 +36,7 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-composer(justinrainbow/json-schema) >= 2.0
+BuildRequires:  php-composer(justinrainbow/json-schema) >= 3.0
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           >= 1.0
@@ -62,7 +62,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0",
+#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.0",
@@ -76,8 +76,8 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-composer(justinrainbow/json-schema) >= 2.0
-Requires:       php-composer(justinrainbow/json-schema) <  5
+Requires:       php-composer(justinrainbow/json-schema) >= 3.0
+Requires:       php-composer(justinrainbow/json-schema) <  6
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -234,6 +234,10 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Wed Mar  8 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1
+- Update to 1.4.0
+- raise dependency on justinrainbow/json-schema version 3 to 5
+
 * Wed Mar  8 2017 Remi Collet <remi@remirepo.net> - 1.3.3-1
 - Update to 1.3.3
 
diff --git a/sources b/sources
index 7f3a0a4..d5af73c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.3.3-989d687.tar.gz) = 343706f1df3145ba17af518efd504b531b9a55fcc39151e1764e92b8845d6990a171494e9ad155c7201bc6ed1ec50b91301941bfb875dfd9ce8a30d39bb8091a
+SHA512 (composer-1.4.0-b19655f.tar.gz) = be4f877a8e6b744eb6b09e7dcf7963f36de0e5a4adcbfa94e12ad201d336342faa511e1afa6e70660c43ef70915c89211893d3949c8c4d27f688d910ca2b8434

From a7afdca0fe3206f7d9704fe1e9c5b41b4b486213 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 10 Mar 2017 10:19:44 +0100
Subject: [PATCH 062/269] v1.4.1

---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 57da520..5c361b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
 /composer-1.3.2-e7569ed.tar.gz
 /composer-1.3.3-989d687.tar.gz
 /composer-1.4.0-b19655f.tar.gz
+/composer-1.4.1-7ee2a5e.tar.gz
diff --git a/composer.spec b/composer.spec
index b87fa76..7d36ef1 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    b19655f1304a3365213204bcf9a9b84476d0d265
+%global gh_commit    7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Fri Mar 10 2017 Remi Collet <remi@remirepo.net> - 1.4.1-1
+- Update to 1.4.1
+
 * Wed Mar  8 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1
 - Update to 1.4.0
 - raise dependency on justinrainbow/json-schema version 3 to 5
diff --git a/sources b/sources
index d5af73c..138a0ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.4.0-b19655f.tar.gz) = be4f877a8e6b744eb6b09e7dcf7963f36de0e5a4adcbfa94e12ad201d336342faa511e1afa6e70660c43ef70915c89211893d3949c8c4d27f688d910ca2b8434
+SHA512 (composer-1.4.1-7ee2a5e.tar.gz) = b32670254e3a06530a30362bc67e6c17f4badc75a0ac571ec917ae6acaef263bd1ae95421440ba43418326b3a38dc8fa1192f8be52a930711a1cf8a88e72364e

From 0bdf966426d2501a39cbac067d3af5bce46fc1eb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 10 Mar 2017 10:19:44 +0100
Subject: [PATCH 063/269] v1.4.1

(cherry picked from commit a7afdca0fe3206f7d9704fe1e9c5b41b4b486213)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 57da520..5c361b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
 /composer-1.3.2-e7569ed.tar.gz
 /composer-1.3.3-989d687.tar.gz
 /composer-1.4.0-b19655f.tar.gz
+/composer-1.4.1-7ee2a5e.tar.gz
diff --git a/composer.spec b/composer.spec
index f84c2f7..72e7df0 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    b19655f1304a3365213204bcf9a9b84476d0d265
+%global gh_commit    7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Fri Mar 10 2017 Remi Collet <remi@remirepo.net> - 1.4.1-1
+- Update to 1.4.1
+
 * Wed Mar  8 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1
 - Update to 1.4.0
 - raise dependency on justinrainbow/json-schema version 3 to 5
diff --git a/sources b/sources
index d5af73c..138a0ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.4.0-b19655f.tar.gz) = be4f877a8e6b744eb6b09e7dcf7963f36de0e5a4adcbfa94e12ad201d336342faa511e1afa6e70660c43ef70915c89211893d3949c8c4d27f688d910ca2b8434
+SHA512 (composer-1.4.1-7ee2a5e.tar.gz) = b32670254e3a06530a30362bc67e6c17f4badc75a0ac571ec917ae6acaef263bd1ae95421440ba43418326b3a38dc8fa1192f8be52a930711a1cf8a88e72364e

From 1e95d671fb383cdc96d877b54ef1f2fa72656564 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 22 May 2017 09:52:48 +0200
Subject: [PATCH 064/269] Update to 1.4.2 fix autoloader to allow symfony 2 and
 3 raise dependency on justinrainbow/json-schema v5 open
 https://github.com/composer/composer/pull/6435 - fix tests

---
 .gitignore            |  1 +
 composer-autoload.php | 23 ++++++++++++++-----
 composer-pr6435.patch | 52 +++++++++++++++++++++++++++++++++++++++++++
 composer.spec         | 51 ++++++++++++++++++++++++++++++++----------
 sources               |  2 +-
 5 files changed, 111 insertions(+), 18 deletions(-)
 create mode 100644 composer-pr6435.patch

diff --git a/.gitignore b/.gitignore
index 5c361b2..54c5d37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ clog
 /composer-1.3.3-989d687.tar.gz
 /composer-1.4.0-b19655f.tar.gz
 /composer-1.4.1-7ee2a5e.tar.gz
+/composer-1.4.2-489e09e.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index f66b4f8..f1f20ac 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -8,7 +8,22 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 
 // Dependencies
 \Fedora\Autoloader\Dependencies::required(array(
-	$vendorDir . '/Symfony/Component/autoload.php',
+	array(
+		$vendorDir . '/Symfony3/Component/Console/autoload.php',
+		$vendorDir . '/Symfony/Component/Console/autoload.php',
+	),
+	array(
+		$vendorDir . '/Symfony3/Component/Finder/autoload.php',
+		$vendorDir . '/Symfony/Component/Finder/autoload.php',
+	),
+	array(
+		$vendorDir . '/Symfony3/Component/Process/autoload.php',
+		$vendorDir . '/Symfony/Component/Process/autoload.php',
+	),
+	array(
+		$vendorDir . '/Symfony3/Component/Filesystem/autoload.php',
+		$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
+	),
 	$vendorDir . '/Seld/JsonLint/autoload.php',
 	$vendorDir . '/Seld/PharUtils/autoload.php',
 	$vendorDir . '/Seld/CliPrompt/autoload.php',
@@ -16,8 +31,6 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 	$vendorDir . '/Composer/Spdx/autoload.php',
 	$vendorDir . '/Composer/Semver/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
-	array(
-		$vendorDir . '/JsonSchema5/autoload.php',
-		$vendorDir . '/JsonSchema4/autoload.php',
-)));
+	$vendorDir . '/JsonSchema5/autoload.php',
+));
 
diff --git a/composer-pr6435.patch b/composer-pr6435.patch
new file mode 100644
index 0000000..71792a9
--- /dev/null
+++ b/composer-pr6435.patch
@@ -0,0 +1,52 @@
+From 95d82f6fde2795c7193cf4ad15fc71d279989842 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 22 May 2017 08:01:51 +0200
+Subject: [PATCH 1/2] fix test for json-schema 5.2
+
+---
+ tests/Composer/Test/Json/ComposerSchemaTest.php | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/Composer/Test/Json/ComposerSchemaTest.php b/tests/Composer/Test/Json/ComposerSchemaTest.php
+index 5ab623d02b6e..41e0cccb4f26 100644
+--- a/tests/Composer/Test/Json/ComposerSchemaTest.php
++++ b/tests/Composer/Test/Json/ComposerSchemaTest.php
+@@ -101,9 +101,10 @@ private function check($json)
+         if (!$validator->isValid()) {
+             $errors = $validator->getErrors();
+ 
+-            // remove justinrainbow/json-schema 3.0 props so it works with all versions
++            // remove justinrainbow/json-schema 3.0/5.2 props so it works with all versions
+             foreach ($errors as &$err) {
+                 unset($err['pointer']);
++                unset($err['context']);
+             }
+ 
+             return $errors;
+
+From 741c8d63fbad0253a53b9558d98ee95b42fdbefc Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 22 May 2017 08:16:45 +0200
+Subject: [PATCH 2/2] fix test for Symfony 3.2
+
+---
+ tests/Composer/Test/IO/ConsoleIOTest.php | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/Composer/Test/IO/ConsoleIOTest.php b/tests/Composer/Test/IO/ConsoleIOTest.php
+index ace27a416f53..ff96a011fc0c 100644
+--- a/tests/Composer/Test/IO/ConsoleIOTest.php
++++ b/tests/Composer/Test/IO/ConsoleIOTest.php
+@@ -218,8 +218,11 @@ public function testAskAndValidate()
+             ->will($this->returnValue($helperMock))
+         ;
+ 
++        $validator = function ($value) {
++             return true;
++        };
+         $consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock);
+-        $consoleIO->askAndValidate('Why?', 'validator', 10, 'default');
++        $consoleIO->askAndValidate('Why?', $validator, 10, 'default');
+     }
+ 
+     public function testSelect()
diff --git a/composer.spec b/composer.spec
index 7d36ef1..9dad4e3 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd
+%global gh_commit    489e09ee6c3ba431fbeeef9147afdaeb6f91b647
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,8 +16,8 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.4.1
-Release:        1%{?dist}
+Version:        1.4.2
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -33,21 +33,36 @@ Source4:        %{name}.csh
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
 
+# https://github.com/composer/composer/issues/6434
+# https://github.com/composer/composer/pull/6435
+Patch1:         %{name}-pr6435.patch
+
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-composer(justinrainbow/json-schema) >= 3.0
+BuildRequires:  php-justinrainbow-json-schema5
+BuildRequires:  php-composer(composer/spdx-licenses)    <  2
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
+BuildRequires:  php-composer(composer/ca-bundle)        <  2
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
+BuildRequires:  php-composer(composer/semver)           <  2
 BuildRequires:  php-composer(composer/semver)           >= 1.0
+BuildRequires:  php-composer(seld/jsonlint)             <  2
 BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
+BuildRequires:  php-composer(seld/phar-utils)           <  2
 BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
+BuildRequires:  php-composer(seld/cli-prompt)           <  2
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
+BuildRequires:  php-composer(psr/log)                   <  2
 BuildRequires:  php-composer(psr/log)                   >= 1.0
-BuildRequires:  php-composer(symfony/console)           >= 2.5
-BuildRequires:  php-composer(symfony/finder)            >= 2.2
-BuildRequires:  php-composer(symfony/filesystem)        >= 2.5
-BuildRequires:  php-composer(symfony/process)           >= 2.1
+BuildRequires:  php-composer(symfony/console)           <  4
+BuildRequires:  php-composer(symfony/console)           >= 2.7
+BuildRequires:  php-composer(symfony/finder)            <  4
+BuildRequires:  php-composer(symfony/finder)            >= 2.7
+BuildRequires:  php-composer(symfony/filesystem)        <  4
+BuildRequires:  php-composer(symfony/filesystem)        >= 2.7
+BuildRequires:  php-composer(symfony/process)           <  4
+BuildRequires:  php-composer(symfony/process)           >= 2.7
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^4.5 || ^5.0.5",
@@ -76,8 +91,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-composer(justinrainbow/json-schema) >= 3.0
-Requires:       php-composer(justinrainbow/json-schema) <  6
+Requires:       php-justinrainbow-json-schema5
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -148,6 +162,7 @@ Documentation: https://getcomposer.org/doc/
 
 %patch0 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
+%patch1 -p1 -b .pr6435
 
 if grep -r '\.\./res'; then
 	: Patch need to fixed
@@ -186,7 +201,6 @@ if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
 
 
 %install
-
 : Profile scripts
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/
@@ -216,7 +230,14 @@ rm -rf res
 
 : Run test suite
 export BUILDROOT=%{buildroot}
-%{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
+
+ret=0
+for cmd in php php56 php70 php71 php72; do
+  if which $cmd; then
+   $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php  --verbose || ret=1
+  fi
+done
+exit $ret
 %else
 : Test suite disabled
 %endif
@@ -234,6 +255,12 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Mon May 22 2017 Remi Collet <remi@remirepo.net> - 1.4.2-2
+- Update to 1.4.2
+- fix autoloader to allow symfony 2 and 3
+- raise dependency on justinrainbow/json-schema v5
+- open https://github.com/composer/composer/pull/6435 - fix tests
+
 * Fri Mar 10 2017 Remi Collet <remi@remirepo.net> - 1.4.1-1
 - Update to 1.4.1
 
diff --git a/sources b/sources
index 138a0ee..0d3519b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.4.1-7ee2a5e.tar.gz) = b32670254e3a06530a30362bc67e6c17f4badc75a0ac571ec917ae6acaef263bd1ae95421440ba43418326b3a38dc8fa1192f8be52a930711a1cf8a88e72364e
+SHA512 (composer-1.4.2-489e09e.tar.gz) = c6fc0aeccc10e67263f939c930850ad8ef705b7cbb52485f683d2c8c9021eecbd89268e7977d779bc4899ec10ff50f2315d0b3d6e45c26a73c59842c3c5d8930

From 232b85a67434de9d5b761d63e8e0219d67f3dc55 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 22 May 2017 09:52:48 +0200
Subject: [PATCH 065/269] Update to 1.4.2 fix autoloader to allow symfony 2 and
 3 raise dependency on justinrainbow/json-schema v5 open
 https://github.com/composer/composer/pull/6435 - fix tests

(cherry picked from commit 1e95d671fb383cdc96d877b54ef1f2fa72656564)
---
 .gitignore            |  1 +
 composer-autoload.php | 23 ++++++++++++++-----
 composer-pr6435.patch | 52 +++++++++++++++++++++++++++++++++++++++++++
 composer.spec         | 51 ++++++++++++++++++++++++++++++++----------
 sources               |  2 +-
 5 files changed, 111 insertions(+), 18 deletions(-)
 create mode 100644 composer-pr6435.patch

diff --git a/.gitignore b/.gitignore
index 5c361b2..54c5d37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ clog
 /composer-1.3.3-989d687.tar.gz
 /composer-1.4.0-b19655f.tar.gz
 /composer-1.4.1-7ee2a5e.tar.gz
+/composer-1.4.2-489e09e.tar.gz
diff --git a/composer-autoload.php b/composer-autoload.php
index f66b4f8..f1f20ac 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -8,7 +8,22 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 
 // Dependencies
 \Fedora\Autoloader\Dependencies::required(array(
-	$vendorDir . '/Symfony/Component/autoload.php',
+	array(
+		$vendorDir . '/Symfony3/Component/Console/autoload.php',
+		$vendorDir . '/Symfony/Component/Console/autoload.php',
+	),
+	array(
+		$vendorDir . '/Symfony3/Component/Finder/autoload.php',
+		$vendorDir . '/Symfony/Component/Finder/autoload.php',
+	),
+	array(
+		$vendorDir . '/Symfony3/Component/Process/autoload.php',
+		$vendorDir . '/Symfony/Component/Process/autoload.php',
+	),
+	array(
+		$vendorDir . '/Symfony3/Component/Filesystem/autoload.php',
+		$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
+	),
 	$vendorDir . '/Seld/JsonLint/autoload.php',
 	$vendorDir . '/Seld/PharUtils/autoload.php',
 	$vendorDir . '/Seld/CliPrompt/autoload.php',
@@ -16,8 +31,6 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 	$vendorDir . '/Composer/Spdx/autoload.php',
 	$vendorDir . '/Composer/Semver/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
-	array(
-		$vendorDir . '/JsonSchema5/autoload.php',
-		$vendorDir . '/JsonSchema4/autoload.php',
-)));
+	$vendorDir . '/JsonSchema5/autoload.php',
+));
 
diff --git a/composer-pr6435.patch b/composer-pr6435.patch
new file mode 100644
index 0000000..71792a9
--- /dev/null
+++ b/composer-pr6435.patch
@@ -0,0 +1,52 @@
+From 95d82f6fde2795c7193cf4ad15fc71d279989842 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 22 May 2017 08:01:51 +0200
+Subject: [PATCH 1/2] fix test for json-schema 5.2
+
+---
+ tests/Composer/Test/Json/ComposerSchemaTest.php | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/Composer/Test/Json/ComposerSchemaTest.php b/tests/Composer/Test/Json/ComposerSchemaTest.php
+index 5ab623d02b6e..41e0cccb4f26 100644
+--- a/tests/Composer/Test/Json/ComposerSchemaTest.php
++++ b/tests/Composer/Test/Json/ComposerSchemaTest.php
+@@ -101,9 +101,10 @@ private function check($json)
+         if (!$validator->isValid()) {
+             $errors = $validator->getErrors();
+ 
+-            // remove justinrainbow/json-schema 3.0 props so it works with all versions
++            // remove justinrainbow/json-schema 3.0/5.2 props so it works with all versions
+             foreach ($errors as &$err) {
+                 unset($err['pointer']);
++                unset($err['context']);
+             }
+ 
+             return $errors;
+
+From 741c8d63fbad0253a53b9558d98ee95b42fdbefc Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 22 May 2017 08:16:45 +0200
+Subject: [PATCH 2/2] fix test for Symfony 3.2
+
+---
+ tests/Composer/Test/IO/ConsoleIOTest.php | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/Composer/Test/IO/ConsoleIOTest.php b/tests/Composer/Test/IO/ConsoleIOTest.php
+index ace27a416f53..ff96a011fc0c 100644
+--- a/tests/Composer/Test/IO/ConsoleIOTest.php
++++ b/tests/Composer/Test/IO/ConsoleIOTest.php
+@@ -218,8 +218,11 @@ public function testAskAndValidate()
+             ->will($this->returnValue($helperMock))
+         ;
+ 
++        $validator = function ($value) {
++             return true;
++        };
+         $consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock);
+-        $consoleIO->askAndValidate('Why?', 'validator', 10, 'default');
++        $consoleIO->askAndValidate('Why?', $validator, 10, 'default');
+     }
+ 
+     public function testSelect()
diff --git a/composer.spec b/composer.spec
index 72e7df0..36d78fa 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd
+%global gh_commit    489e09ee6c3ba431fbeeef9147afdaeb6f91b647
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,8 +16,8 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.4.1
-Release:        1%{?dist}
+Version:        1.4.2
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -33,21 +33,36 @@ Source4:        %{name}.csh
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
 
+# https://github.com/composer/composer/issues/6434
+# https://github.com/composer/composer/pull/6435
+Patch1:         %{name}-pr6435.patch
+
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-composer(justinrainbow/json-schema) >= 3.0
+BuildRequires:  php-justinrainbow-json-schema5
+BuildRequires:  php-composer(composer/spdx-licenses)    <  2
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
+BuildRequires:  php-composer(composer/ca-bundle)        <  2
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
+BuildRequires:  php-composer(composer/semver)           <  2
 BuildRequires:  php-composer(composer/semver)           >= 1.0
+BuildRequires:  php-composer(seld/jsonlint)             <  2
 BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
+BuildRequires:  php-composer(seld/phar-utils)           <  2
 BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
+BuildRequires:  php-composer(seld/cli-prompt)           <  2
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
+BuildRequires:  php-composer(psr/log)                   <  2
 BuildRequires:  php-composer(psr/log)                   >= 1.0
-BuildRequires:  php-composer(symfony/console)           >= 2.5
-BuildRequires:  php-composer(symfony/finder)            >= 2.2
-BuildRequires:  php-composer(symfony/filesystem)        >= 2.5
-BuildRequires:  php-composer(symfony/process)           >= 2.1
+BuildRequires:  php-composer(symfony/console)           <  4
+BuildRequires:  php-composer(symfony/console)           >= 2.7
+BuildRequires:  php-composer(symfony/finder)            <  4
+BuildRequires:  php-composer(symfony/finder)            >= 2.7
+BuildRequires:  php-composer(symfony/filesystem)        <  4
+BuildRequires:  php-composer(symfony/filesystem)        >= 2.7
+BuildRequires:  php-composer(symfony/process)           <  4
+BuildRequires:  php-composer(symfony/process)           >= 2.7
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^4.5 || ^5.0.5",
@@ -76,8 +91,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-composer(justinrainbow/json-schema) >= 3.0
-Requires:       php-composer(justinrainbow/json-schema) <  6
+Requires:       php-justinrainbow-json-schema5
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -148,6 +162,7 @@ Documentation: https://getcomposer.org/doc/
 
 %patch0 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
+%patch1 -p1 -b .pr6435
 
 if grep -r '\.\./res'; then
 	: Patch need to fixed
@@ -186,7 +201,6 @@ if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
 
 
 %install
-
 : Profile scripts
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/
@@ -216,7 +230,14 @@ rm -rf res
 
 : Run test suite
 export BUILDROOT=%{buildroot}
-%{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose
+
+ret=0
+for cmd in php php56 php70 php71 php72; do
+  if which $cmd; then
+   $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php  --verbose || ret=1
+  fi
+done
+exit $ret
 %else
 : Test suite disabled
 %endif
@@ -234,6 +255,12 @@ export BUILDROOT=%{buildroot}
 
 
 %changelog
+* Mon May 22 2017 Remi Collet <remi@remirepo.net> - 1.4.2-2
+- Update to 1.4.2
+- fix autoloader to allow symfony 2 and 3
+- raise dependency on justinrainbow/json-schema v5
+- open https://github.com/composer/composer/pull/6435 - fix tests
+
 * Fri Mar 10 2017 Remi Collet <remi@remirepo.net> - 1.4.1-1
 - Update to 1.4.1
 
diff --git a/sources b/sources
index 138a0ee..0d3519b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.4.1-7ee2a5e.tar.gz) = b32670254e3a06530a30362bc67e6c17f4badc75a0ac571ec917ae6acaef263bd1ae95421440ba43418326b3a38dc8fa1192f8be52a930711a1cf8a88e72364e
+SHA512 (composer-1.4.2-489e09e.tar.gz) = c6fc0aeccc10e67263f939c930850ad8ef705b7cbb52485f683d2c8c9021eecbd89268e7977d779bc4899ec10ff50f2315d0b3d6e45c26a73c59842c3c5d8930

From c86adda9339fa660dbb4f3ec25db19ec547e92e0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 05:21:31 +0000
Subject: [PATCH 066/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 9dad4e3..e0e548f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -255,6 +255,9 @@ exit $ret
 
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Mon May 22 2017 Remi Collet <remi@remirepo.net> - 1.4.2-2
 - Update to 1.4.2
 - fix autoloader to allow symfony 2 and 3

From d7ea71dd270c88094c93c8d0bf1af1ae06446fc7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Aug 2017 07:33:51 +0200
Subject: [PATCH 067/269] Update to 1.4.3 ignore 2 failed tests related to BC
 break in symfony

---
 .gitignore            |  1 +
 composer-pr6435.patch | 52 -------------------------------------------
 composer.spec         | 20 ++++++++++-------
 sources               |  2 +-
 4 files changed, 14 insertions(+), 61 deletions(-)
 delete mode 100644 composer-pr6435.patch

diff --git a/.gitignore b/.gitignore
index 54c5d37..1173984 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ clog
 /composer-1.4.0-b19655f.tar.gz
 /composer-1.4.1-7ee2a5e.tar.gz
 /composer-1.4.2-489e09e.tar.gz
+/composer-1.4.3-62c17fd.tar.gz
diff --git a/composer-pr6435.patch b/composer-pr6435.patch
deleted file mode 100644
index 71792a9..0000000
--- a/composer-pr6435.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 95d82f6fde2795c7193cf4ad15fc71d279989842 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 22 May 2017 08:01:51 +0200
-Subject: [PATCH 1/2] fix test for json-schema 5.2
-
----
- tests/Composer/Test/Json/ComposerSchemaTest.php | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/Composer/Test/Json/ComposerSchemaTest.php b/tests/Composer/Test/Json/ComposerSchemaTest.php
-index 5ab623d02b6e..41e0cccb4f26 100644
---- a/tests/Composer/Test/Json/ComposerSchemaTest.php
-+++ b/tests/Composer/Test/Json/ComposerSchemaTest.php
-@@ -101,9 +101,10 @@ private function check($json)
-         if (!$validator->isValid()) {
-             $errors = $validator->getErrors();
- 
--            // remove justinrainbow/json-schema 3.0 props so it works with all versions
-+            // remove justinrainbow/json-schema 3.0/5.2 props so it works with all versions
-             foreach ($errors as &$err) {
-                 unset($err['pointer']);
-+                unset($err['context']);
-             }
- 
-             return $errors;
-
-From 741c8d63fbad0253a53b9558d98ee95b42fdbefc Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 22 May 2017 08:16:45 +0200
-Subject: [PATCH 2/2] fix test for Symfony 3.2
-
----
- tests/Composer/Test/IO/ConsoleIOTest.php | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/Composer/Test/IO/ConsoleIOTest.php b/tests/Composer/Test/IO/ConsoleIOTest.php
-index ace27a416f53..ff96a011fc0c 100644
---- a/tests/Composer/Test/IO/ConsoleIOTest.php
-+++ b/tests/Composer/Test/IO/ConsoleIOTest.php
-@@ -218,8 +218,11 @@ public function testAskAndValidate()
-             ->will($this->returnValue($helperMock))
-         ;
- 
-+        $validator = function ($value) {
-+             return true;
-+        };
-         $consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock);
--        $consoleIO->askAndValidate('Why?', 'validator', 10, 'default');
-+        $consoleIO->askAndValidate('Why?', $validator, 10, 'default');
-     }
- 
-     public function testSelect()
diff --git a/composer.spec b/composer.spec
index e0e548f..8e44a6b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    489e09ee6c3ba431fbeeef9147afdaeb6f91b647
+%global gh_commit    62c17fdf79a1f7f42778aed376da9c8cb03e5f62
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,8 +16,8 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.4.2
-Release:        3%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -33,10 +33,6 @@ Source4:        %{name}.csh
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
 
-# https://github.com/composer/composer/issues/6434
-# https://github.com/composer/composer/pull/6435
-Patch1:         %{name}-pr6435.patch
-
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
@@ -162,7 +158,6 @@ Documentation: https://getcomposer.org/doc/
 
 %patch0 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
-%patch1 -p1 -b .pr6435
 
 if grep -r '\.\./res'; then
 	: Patch need to fixed
@@ -225,6 +220,11 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 : Online tests
 rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
+: Known to fail - regression in recent symfony version
+sed -e 's/testDevWarningPrevented/SKIP_testDevWarningPrevented/' \
+    -e 's/testDevWarningPreventedAlias/SKIP_testDevWarningPreventedAlias/' \
+    -i tests/Composer/Test/ApplicationTest.php
+
 : Ensure not used
 rm -rf res
 
@@ -255,6 +255,10 @@ exit $ret
 
 
 %changelog
+* Mon Aug  7 2017 Remi Collet <remi@remirepo.net> - 1.4.3-1
+- Update to 1.4.3
+- ignore 2 failed tests related to BC break in symfony
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index 0d3519b..538a849 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.4.2-489e09e.tar.gz) = c6fc0aeccc10e67263f939c930850ad8ef705b7cbb52485f683d2c8c9021eecbd89268e7977d779bc4899ec10ff50f2315d0b3d6e45c26a73c59842c3c5d8930
+SHA512 (composer-1.4.3-62c17fd.tar.gz) = dbf646fe6fb43cd4bf6e241a1f657ba8f2f07223283c86b6dcf52352e0219f49925e5ae5ef509bffc610c4e1e368ca6afd4f85b334ee4b1de2362ce59746bb46

From ef6cb0a4f6586465a34430aced25468e369b12b2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Aug 2017 07:33:51 +0200
Subject: [PATCH 068/269] Update to 1.4.3 ignore 2 failed tests related to BC
 break in symfony

(cherry picked from commit d7ea71dd270c88094c93c8d0bf1af1ae06446fc7)
(cherry picked from commit 0ea11208a9b3f7c4989553432898507295db4046)
---
 .gitignore            |  1 +
 composer-pr6435.patch | 52 -------------------------------------------
 composer.spec         | 20 ++++++++++-------
 sources               |  2 +-
 4 files changed, 14 insertions(+), 61 deletions(-)
 delete mode 100644 composer-pr6435.patch

diff --git a/.gitignore b/.gitignore
index 54c5d37..1173984 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ clog
 /composer-1.4.0-b19655f.tar.gz
 /composer-1.4.1-7ee2a5e.tar.gz
 /composer-1.4.2-489e09e.tar.gz
+/composer-1.4.3-62c17fd.tar.gz
diff --git a/composer-pr6435.patch b/composer-pr6435.patch
deleted file mode 100644
index 71792a9..0000000
--- a/composer-pr6435.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 95d82f6fde2795c7193cf4ad15fc71d279989842 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 22 May 2017 08:01:51 +0200
-Subject: [PATCH 1/2] fix test for json-schema 5.2
-
----
- tests/Composer/Test/Json/ComposerSchemaTest.php | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/Composer/Test/Json/ComposerSchemaTest.php b/tests/Composer/Test/Json/ComposerSchemaTest.php
-index 5ab623d02b6e..41e0cccb4f26 100644
---- a/tests/Composer/Test/Json/ComposerSchemaTest.php
-+++ b/tests/Composer/Test/Json/ComposerSchemaTest.php
-@@ -101,9 +101,10 @@ private function check($json)
-         if (!$validator->isValid()) {
-             $errors = $validator->getErrors();
- 
--            // remove justinrainbow/json-schema 3.0 props so it works with all versions
-+            // remove justinrainbow/json-schema 3.0/5.2 props so it works with all versions
-             foreach ($errors as &$err) {
-                 unset($err['pointer']);
-+                unset($err['context']);
-             }
- 
-             return $errors;
-
-From 741c8d63fbad0253a53b9558d98ee95b42fdbefc Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Mon, 22 May 2017 08:16:45 +0200
-Subject: [PATCH 2/2] fix test for Symfony 3.2
-
----
- tests/Composer/Test/IO/ConsoleIOTest.php | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/tests/Composer/Test/IO/ConsoleIOTest.php b/tests/Composer/Test/IO/ConsoleIOTest.php
-index ace27a416f53..ff96a011fc0c 100644
---- a/tests/Composer/Test/IO/ConsoleIOTest.php
-+++ b/tests/Composer/Test/IO/ConsoleIOTest.php
-@@ -218,8 +218,11 @@ public function testAskAndValidate()
-             ->will($this->returnValue($helperMock))
-         ;
- 
-+        $validator = function ($value) {
-+             return true;
-+        };
-         $consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock);
--        $consoleIO->askAndValidate('Why?', 'validator', 10, 'default');
-+        $consoleIO->askAndValidate('Why?', $validator, 10, 'default');
-     }
- 
-     public function testSelect()
diff --git a/composer.spec b/composer.spec
index 36d78fa..ed33861 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    489e09ee6c3ba431fbeeef9147afdaeb6f91b647
+%global gh_commit    62c17fdf79a1f7f42778aed376da9c8cb03e5f62
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,8 +16,8 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.4.3
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -33,10 +33,6 @@ Source4:        %{name}.csh
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
 
-# https://github.com/composer/composer/issues/6434
-# https://github.com/composer/composer/pull/6435
-Patch1:         %{name}-pr6435.patch
-
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
@@ -162,7 +158,6 @@ Documentation: https://getcomposer.org/doc/
 
 %patch0 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
-%patch1 -p1 -b .pr6435
 
 if grep -r '\.\./res'; then
 	: Patch need to fixed
@@ -225,6 +220,11 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 : Online tests
 rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
+: Known to fail - regression in recent symfony version
+sed -e 's/testDevWarningPrevented/SKIP_testDevWarningPrevented/' \
+    -e 's/testDevWarningPreventedAlias/SKIP_testDevWarningPreventedAlias/' \
+    -i tests/Composer/Test/ApplicationTest.php
+
 : Ensure not used
 rm -rf res
 
@@ -255,6 +255,10 @@ exit $ret
 
 
 %changelog
+* Mon Aug  7 2017 Remi Collet <remi@remirepo.net> - 1.4.3-1
+- Update to 1.4.3
+- ignore 2 failed tests related to BC break in symfony
+
 * Mon May 22 2017 Remi Collet <remi@remirepo.net> - 1.4.2-2
 - Update to 1.4.2
 - fix autoloader to allow symfony 2 and 3
diff --git a/sources b/sources
index 0d3519b..538a849 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.4.2-489e09e.tar.gz) = c6fc0aeccc10e67263f939c930850ad8ef705b7cbb52485f683d2c8c9021eecbd89268e7977d779bc4899ec10ff50f2315d0b3d6e45c26a73c59842c3c5d8930
+SHA512 (composer-1.4.3-62c17fd.tar.gz) = dbf646fe6fb43cd4bf6e241a1f657ba8f2f07223283c86b6dcf52352e0219f49925e5ae5ef509bffc610c4e1e368ca6afd4f85b334ee4b1de2362ce59746bb46

From 3bfaceb3ada4c265dbb3853993431827b5298bd0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 8 Aug 2017 12:04:07 +0200
Subject: [PATCH 069/269] v1.5.0

---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1173984..e1ddb84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ clog
 /composer-1.4.1-7ee2a5e.tar.gz
 /composer-1.4.2-489e09e.tar.gz
 /composer-1.4.3-62c17fd.tar.gz
+/composer-1.5.0-6f3310c.tar.gz
diff --git a/composer.spec b/composer.spec
index 8e44a6b..626c7cc 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    62c17fdf79a1f7f42778aed376da9c8cb03e5f62
+%global gh_commit    6f3310c762b658bca64e060262ea2b1d4a1ec4b0
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.4.3
+Version:        1.5.0
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -255,6 +255,9 @@ exit $ret
 
 
 %changelog
+* Tue Aug  8 2017 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- Update to 1.5.0
+
 * Mon Aug  7 2017 Remi Collet <remi@remirepo.net> - 1.4.3-1
 - Update to 1.4.3
 - ignore 2 failed tests related to BC break in symfony
diff --git a/sources b/sources
index 538a849..df09220 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.4.3-62c17fd.tar.gz) = dbf646fe6fb43cd4bf6e241a1f657ba8f2f07223283c86b6dcf52352e0219f49925e5ae5ef509bffc610c4e1e368ca6afd4f85b334ee4b1de2362ce59746bb46
+SHA512 (composer-1.5.0-6f3310c.tar.gz) = 1a3c87538ffd51c74aeadd9b285fd488702d4d2678ab8267e218f98a5782c2888d0f1c90bcf0b3f538b15a97b2e22f63ae236db6efb25c5c2e790d9e608f4d19

From 3c9a5e0de009b273cc51be2ded3d76eca81cc4d0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 8 Aug 2017 12:04:07 +0200
Subject: [PATCH 070/269] v1.5.0

(cherry picked from commit 3bfaceb3ada4c265dbb3853993431827b5298bd0)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1173984..e1ddb84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ clog
 /composer-1.4.1-7ee2a5e.tar.gz
 /composer-1.4.2-489e09e.tar.gz
 /composer-1.4.3-62c17fd.tar.gz
+/composer-1.5.0-6f3310c.tar.gz
diff --git a/composer.spec b/composer.spec
index ed33861..5a9c63b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    62c17fdf79a1f7f42778aed376da9c8cb03e5f62
+%global gh_commit    6f3310c762b658bca64e060262ea2b1d4a1ec4b0
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.4.3
+Version:        1.5.0
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -255,6 +255,9 @@ exit $ret
 
 
 %changelog
+* Tue Aug  8 2017 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- Update to 1.5.0
+
 * Mon Aug  7 2017 Remi Collet <remi@remirepo.net> - 1.4.3-1
 - Update to 1.4.3
 - ignore 2 failed tests related to BC break in symfony
diff --git a/sources b/sources
index 538a849..df09220 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.4.3-62c17fd.tar.gz) = dbf646fe6fb43cd4bf6e241a1f657ba8f2f07223283c86b6dcf52352e0219f49925e5ae5ef509bffc610c4e1e368ca6afd4f85b334ee4b1de2362ce59746bb46
+SHA512 (composer-1.5.0-6f3310c.tar.gz) = 1a3c87538ffd51c74aeadd9b285fd488702d4d2678ab8267e218f98a5782c2888d0f1c90bcf0b3f538b15a97b2e22f63ae236db6efb25c5c2e790d9e608f4d19

From e7579fdddc52b085b441454d24b2467c2eb16bb9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 9 Aug 2017 17:21:43 +0200
Subject: [PATCH 071/269] v1.5.1

---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1ddb84..7c4c942 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ clog
 /composer-1.4.2-489e09e.tar.gz
 /composer-1.4.3-62c17fd.tar.gz
 /composer-1.5.0-6f3310c.tar.gz
+/composer-1.5.1-d60a1ff.tar.gz
diff --git a/composer.spec b/composer.spec
index 626c7cc..725fa63 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    6f3310c762b658bca64e060262ea2b1d4a1ec4b0
+%global gh_commit    d60a1ff0cb421fcd2811c3f2b57f7e3e2b6c9d0e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.5.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -232,7 +232,7 @@ rm -rf res
 export BUILDROOT=%{buildroot}
 
 ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php56 php70 php71 php72 php; do
   if which $cmd; then
    $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php  --verbose || ret=1
   fi
@@ -255,6 +255,9 @@ exit $ret
 
 
 %changelog
+* Wed Aug  9 2017 Remi Collet <remi@remirepo.net> - 1.5.1-1
+- Update to 1.5.1
+
 * Tue Aug  8 2017 Remi Collet <remi@remirepo.net> - 1.5.0-1
 - Update to 1.5.0
 
diff --git a/sources b/sources
index df09220..bf90da1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.0-6f3310c.tar.gz) = 1a3c87538ffd51c74aeadd9b285fd488702d4d2678ab8267e218f98a5782c2888d0f1c90bcf0b3f538b15a97b2e22f63ae236db6efb25c5c2e790d9e608f4d19
+SHA512 (composer-1.5.1-d60a1ff.tar.gz) = 36470e017a900c33a3fa6f76e9da85f31a34f5d9e82399c8f735204f84aac685c60d91d02b22e1a3c8490178ac58d958c317c1a05ecb034bda87cab2005b866b

From 59cf0c360c6ae68ebef0da1d23b32076138c803f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 9 Aug 2017 17:21:43 +0200
Subject: [PATCH 072/269] v1.5.1

(cherry picked from commit e7579fdddc52b085b441454d24b2467c2eb16bb9)
---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e1ddb84..7c4c942 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ clog
 /composer-1.4.2-489e09e.tar.gz
 /composer-1.4.3-62c17fd.tar.gz
 /composer-1.5.0-6f3310c.tar.gz
+/composer-1.5.1-d60a1ff.tar.gz
diff --git a/composer.spec b/composer.spec
index 5a9c63b..7890d61 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    6f3310c762b658bca64e060262ea2b1d4a1ec4b0
+%global gh_commit    d60a1ff0cb421fcd2811c3f2b57f7e3e2b6c9d0e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.5.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -232,7 +232,7 @@ rm -rf res
 export BUILDROOT=%{buildroot}
 
 ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php56 php70 php71 php72 php; do
   if which $cmd; then
    $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php  --verbose || ret=1
   fi
@@ -255,6 +255,9 @@ exit $ret
 
 
 %changelog
+* Wed Aug  9 2017 Remi Collet <remi@remirepo.net> - 1.5.1-1
+- Update to 1.5.1
+
 * Tue Aug  8 2017 Remi Collet <remi@remirepo.net> - 1.5.0-1
 - Update to 1.5.0
 
diff --git a/sources b/sources
index df09220..bf90da1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.0-6f3310c.tar.gz) = 1a3c87538ffd51c74aeadd9b285fd488702d4d2678ab8267e218f98a5782c2888d0f1c90bcf0b3f538b15a97b2e22f63ae236db6efb25c5c2e790d9e608f4d19
+SHA512 (composer-1.5.1-d60a1ff.tar.gz) = 36470e017a900c33a3fa6f76e9da85f31a34f5d9e82399c8f735204f84aac685c60d91d02b22e1a3c8490178ac58d958c317c1a05ecb034bda87cab2005b866b

From 3810b647e32b9293d8f95d33d9a201a814fa3ff3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 12 Sep 2017 07:29:53 +0200
Subject: [PATCH 073/269] v1.5.2

---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c4c942..9711caf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ clog
 /composer-1.4.3-62c17fd.tar.gz
 /composer-1.5.0-6f3310c.tar.gz
 /composer-1.5.1-d60a1ff.tar.gz
+/composer-1.5.2-c639623.tar.gz
diff --git a/composer.spec b/composer.spec
index 725fa63..b1af3e9 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    d60a1ff0cb421fcd2811c3f2b57f7e3e2b6c9d0e
+%global gh_commit    c639623fa2178b404ed4bab80f0d1263853fa4ae
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.5.1
+Version:        1.5.2
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -232,7 +232,7 @@ rm -rf res
 export BUILDROOT=%{buildroot}
 
 ret=0
-for cmd in php56 php70 php71 php72 php; do
+for cmd in php php56 php70 php71 php72; do
   if which $cmd; then
    $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php  --verbose || ret=1
   fi
@@ -255,6 +255,9 @@ exit $ret
 
 
 %changelog
+* Mon Sep 11 2017 Remi Collet <remi@remirepo.net> - 1.5.2-1
+- Update to 1.5.2
+
 * Wed Aug  9 2017 Remi Collet <remi@remirepo.net> - 1.5.1-1
 - Update to 1.5.1
 
diff --git a/sources b/sources
index bf90da1..e24e280 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.1-d60a1ff.tar.gz) = 36470e017a900c33a3fa6f76e9da85f31a34f5d9e82399c8f735204f84aac685c60d91d02b22e1a3c8490178ac58d958c317c1a05ecb034bda87cab2005b866b
+SHA512 (composer-1.5.2-c639623.tar.gz) = 03b7dfb319b8457cf69589fd116c73169e9a044c8fe17624164343586e10c3bd8470c7df45b6a796cba9e9ed6de5ff6c640f7d881661d93fb71dcbe9aa140603

From b044712eeacd14be84a5c6aecba87fa97055d0ab Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 12 Sep 2017 07:29:53 +0200
Subject: [PATCH 074/269] v1.5.2

(cherry picked from commit 3810b647e32b9293d8f95d33d9a201a814fa3ff3)
---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c4c942..9711caf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ clog
 /composer-1.4.3-62c17fd.tar.gz
 /composer-1.5.0-6f3310c.tar.gz
 /composer-1.5.1-d60a1ff.tar.gz
+/composer-1.5.2-c639623.tar.gz
diff --git a/composer.spec b/composer.spec
index 7890d61..8c4f956 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    d60a1ff0cb421fcd2811c3f2b57f7e3e2b6c9d0e
+%global gh_commit    c639623fa2178b404ed4bab80f0d1263853fa4ae
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.5.1
+Version:        1.5.2
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -232,7 +232,7 @@ rm -rf res
 export BUILDROOT=%{buildroot}
 
 ret=0
-for cmd in php56 php70 php71 php72 php; do
+for cmd in php php56 php70 php71 php72; do
   if which $cmd; then
    $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php  --verbose || ret=1
   fi
@@ -255,6 +255,9 @@ exit $ret
 
 
 %changelog
+* Mon Sep 11 2017 Remi Collet <remi@remirepo.net> - 1.5.2-1
+- Update to 1.5.2
+
 * Wed Aug  9 2017 Remi Collet <remi@remirepo.net> - 1.5.1-1
 - Update to 1.5.1
 
diff --git a/sources b/sources
index bf90da1..e24e280 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.1-d60a1ff.tar.gz) = 36470e017a900c33a3fa6f76e9da85f31a34f5d9e82399c8f735204f84aac685c60d91d02b22e1a3c8490178ac58d958c317c1a05ecb034bda87cab2005b866b
+SHA512 (composer-1.5.2-c639623.tar.gz) = 03b7dfb319b8457cf69589fd116c73169e9a044c8fe17624164343586e10c3bd8470c7df45b6a796cba9e9ed6de5ff6c640f7d881661d93fb71dcbe9aa140603

From 847239d325b2104875171ae3c1baadf942421195 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 1 Dec 2017 07:32:24 +0100
Subject: [PATCH 075/269] v1.5.3

---
 .gitignore    |  1 +
 composer.spec | 12 +++++++++---
 sources       |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9711caf..9276982 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ clog
 /composer-1.5.0-6f3310c.tar.gz
 /composer-1.5.1-d60a1ff.tar.gz
 /composer-1.5.2-c639623.tar.gz
+/composer-1.5.3-de0c4af.tar.gz
diff --git a/composer.spec b/composer.spec
index b1af3e9..4a473d0 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    c639623fa2178b404ed4bab80f0d1263853fa4ae
+%global gh_commit    de0c4afd4aeb08171b54b64e63aa61a04b4510ee
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.5.2
+Version:        1.5.3
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -231,10 +231,13 @@ rm -rf res
 : Run test suite
 export BUILDROOT=%{buildroot}
 
+# testIntegration may hang on local build
 ret=0
 for cmd in php php56 php70 php71 php72; do
   if which $cmd; then
-   $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php  --verbose || ret=1
+    $cmd -d memory_limit=1G %{_bindir}/phpunit \
+      --filter '^((?!(testIntegration)).)*$' \
+      --include-path %{buildroot}%{_datadir}/php  || ret=1
   fi
 done
 exit $ret
@@ -255,6 +258,9 @@ exit $ret
 
 
 %changelog
+* Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.3-1
+- Update to 1.5.3
+
 * Mon Sep 11 2017 Remi Collet <remi@remirepo.net> - 1.5.2-1
 - Update to 1.5.2
 
diff --git a/sources b/sources
index e24e280..8a33ea2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.2-c639623.tar.gz) = 03b7dfb319b8457cf69589fd116c73169e9a044c8fe17624164343586e10c3bd8470c7df45b6a796cba9e9ed6de5ff6c640f7d881661d93fb71dcbe9aa140603
+SHA512 (composer-1.5.3-de0c4af.tar.gz) = f97ba5e1eed9f1e270ae9633f56a2c28e5dc1175f4a9acdaf88336c3d83b4361b2f1dabed34b6a2aa2dda617caa0231c67c108f0c7294af24a6d6a810c99e48e

From 772cee62962f2bbb3ed776279b1c25101290e576 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 1 Dec 2017 07:32:24 +0100
Subject: [PATCH 076/269] v1.5.3

(cherry picked from commit 847239d325b2104875171ae3c1baadf942421195)
---
 .gitignore    |  1 +
 composer.spec | 12 +++++++++---
 sources       |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9711caf..9276982 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ clog
 /composer-1.5.0-6f3310c.tar.gz
 /composer-1.5.1-d60a1ff.tar.gz
 /composer-1.5.2-c639623.tar.gz
+/composer-1.5.3-de0c4af.tar.gz
diff --git a/composer.spec b/composer.spec
index 8c4f956..933adf4 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    c639623fa2178b404ed4bab80f0d1263853fa4ae
+%global gh_commit    de0c4afd4aeb08171b54b64e63aa61a04b4510ee
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.5.2
+Version:        1.5.3
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -231,10 +231,13 @@ rm -rf res
 : Run test suite
 export BUILDROOT=%{buildroot}
 
+# testIntegration may hang on local build
 ret=0
 for cmd in php php56 php70 php71 php72; do
   if which $cmd; then
-   $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php  --verbose || ret=1
+    $cmd -d memory_limit=1G %{_bindir}/phpunit \
+      --filter '^((?!(testIntegration)).)*$' \
+      --include-path %{buildroot}%{_datadir}/php  || ret=1
   fi
 done
 exit $ret
@@ -255,6 +258,9 @@ exit $ret
 
 
 %changelog
+* Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.3-1
+- Update to 1.5.3
+
 * Mon Sep 11 2017 Remi Collet <remi@remirepo.net> - 1.5.2-1
 - Update to 1.5.2
 
diff --git a/sources b/sources
index e24e280..8a33ea2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.2-c639623.tar.gz) = 03b7dfb319b8457cf69589fd116c73169e9a044c8fe17624164343586e10c3bd8470c7df45b6a796cba9e9ed6de5ff6c640f7d881661d93fb71dcbe9aa140603
+SHA512 (composer-1.5.3-de0c4af.tar.gz) = f97ba5e1eed9f1e270ae9633f56a2c28e5dc1175f4a9acdaf88336c3d83b4361b2f1dabed34b6a2aa2dda617caa0231c67c108f0c7294af24a6d6a810c99e48e

From 35740d006364effd447a107b739eb4879482573f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 1 Dec 2017 12:17:07 +0100
Subject: [PATCH 077/269] v1.5.4

---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9276982..b3495e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ clog
 /composer-1.5.1-d60a1ff.tar.gz
 /composer-1.5.2-c639623.tar.gz
 /composer-1.5.3-de0c4af.tar.gz
+/composer-1.5.4-73aa733.tar.gz
diff --git a/composer.spec b/composer.spec
index 4a473d0..d6a19af 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    de0c4afd4aeb08171b54b64e63aa61a04b4510ee
+%global gh_commit    73aa733d2a64afa4713814965e56ee70bf725829
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.5.3
+Version:        1.5.4
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -258,6 +258,9 @@ exit $ret
 
 
 %changelog
+* Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.4-1
+- Update to 1.5.4
+
 * Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.3-1
 - Update to 1.5.3
 
diff --git a/sources b/sources
index 8a33ea2..24c8d7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.3-de0c4af.tar.gz) = f97ba5e1eed9f1e270ae9633f56a2c28e5dc1175f4a9acdaf88336c3d83b4361b2f1dabed34b6a2aa2dda617caa0231c67c108f0c7294af24a6d6a810c99e48e
+SHA512 (composer-1.5.4-73aa733.tar.gz) = 8345319117726a7cebb7f4ae295867a8a6e2c4003449e90484462a74cc5800c233b1c4fd7b953e0420fadde480c010dedf0cb95e1de8b3a379254ff3eda77e9a

From 88431526e11fc91f67f090411bde4e9ad75187cf Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 1 Dec 2017 12:17:07 +0100
Subject: [PATCH 078/269] v1.5.4

(cherry picked from commit 35740d006364effd447a107b739eb4879482573f)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9276982..b3495e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ clog
 /composer-1.5.1-d60a1ff.tar.gz
 /composer-1.5.2-c639623.tar.gz
 /composer-1.5.3-de0c4af.tar.gz
+/composer-1.5.4-73aa733.tar.gz
diff --git a/composer.spec b/composer.spec
index 933adf4..8280cd3 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    de0c4afd4aeb08171b54b64e63aa61a04b4510ee
+%global gh_commit    73aa733d2a64afa4713814965e56ee70bf725829
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.5.3
+Version:        1.5.4
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -258,6 +258,9 @@ exit $ret
 
 
 %changelog
+* Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.4-1
+- Update to 1.5.4
+
 * Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.3-1
 - Update to 1.5.3
 
diff --git a/sources b/sources
index 8a33ea2..24c8d7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.3-de0c4af.tar.gz) = f97ba5e1eed9f1e270ae9633f56a2c28e5dc1175f4a9acdaf88336c3d83b4361b2f1dabed34b6a2aa2dda617caa0231c67c108f0c7294af24a6d6a810c99e48e
+SHA512 (composer-1.5.4-73aa733.tar.gz) = 8345319117726a7cebb7f4ae295867a8a6e2c4003449e90484462a74cc5800c233b1c4fd7b953e0420fadde480c010dedf0cb95e1de8b3a379254ff3eda77e9a

From 15831db03c7a692f74de2989f2e956439f9432ba Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 1 Dec 2017 15:26:40 +0100
Subject: [PATCH 079/269] v1.5.5

---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3495e4..3702a2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ clog
 /composer-1.5.2-c639623.tar.gz
 /composer-1.5.3-de0c4af.tar.gz
 /composer-1.5.4-73aa733.tar.gz
+/composer-1.5.5-aab6229.tar.gz
diff --git a/composer.spec b/composer.spec
index d6a19af..100878f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    73aa733d2a64afa4713814965e56ee70bf725829
+%global gh_commit    aab6229c9a4b6731f23b36107c39f4007c290b50
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.5.4
+Version:        1.5.5
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -258,6 +258,9 @@ exit $ret
 
 
 %changelog
+* Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.5-1
+- Update to 1.5.5
+
 * Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.4-1
 - Update to 1.5.4
 
diff --git a/sources b/sources
index 24c8d7d..0ed945d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.4-73aa733.tar.gz) = 8345319117726a7cebb7f4ae295867a8a6e2c4003449e90484462a74cc5800c233b1c4fd7b953e0420fadde480c010dedf0cb95e1de8b3a379254ff3eda77e9a
+SHA512 (composer-1.5.5-aab6229.tar.gz) = 29b1e2374412b753ba324436b24fda007434e87cc8ed616f7c31f70efd3ff1024a7b468c8d44285a7e394baa4e4d205c418fe97569731699a06fc06068fbd5aa

From d66b2cc1e3c1ff1de3e001eea0af64dbe6c5d183 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 1 Dec 2017 15:26:40 +0100
Subject: [PATCH 080/269] v1.5.5

(cherry picked from commit 15831db03c7a692f74de2989f2e956439f9432ba)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b3495e4..3702a2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ clog
 /composer-1.5.2-c639623.tar.gz
 /composer-1.5.3-de0c4af.tar.gz
 /composer-1.5.4-73aa733.tar.gz
+/composer-1.5.5-aab6229.tar.gz
diff --git a/composer.spec b/composer.spec
index 8280cd3..bfa57c2 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    73aa733d2a64afa4713814965e56ee70bf725829
+%global gh_commit    aab6229c9a4b6731f23b36107c39f4007c290b50
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 #global prever       RC
 
 Name:           composer
-Version:        1.5.4
+Version:        1.5.5
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -258,6 +258,9 @@ exit $ret
 
 
 %changelog
+* Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.5-1
+- Update to 1.5.5
+
 * Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.4-1
 - Update to 1.5.4
 
diff --git a/sources b/sources
index 24c8d7d..0ed945d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.4-73aa733.tar.gz) = 8345319117726a7cebb7f4ae295867a8a6e2c4003449e90484462a74cc5800c233b1c4fd7b953e0420fadde480c010dedf0cb95e1de8b3a379254ff3eda77e9a
+SHA512 (composer-1.5.5-aab6229.tar.gz) = 29b1e2374412b753ba324436b24fda007434e87cc8ed616f7c31f70efd3ff1024a7b468c8d44285a7e394baa4e4d205c418fe97569731699a06fc06068fbd5aa

From 7d2626d11c68b5256e7c1291add541e2d75f6278 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 18 Dec 2017 15:27:25 +0100
Subject: [PATCH 081/269] Update to 1.5.6 switch to symfony package names

---
 .gitignore    |  1 +
 composer.spec | 38 ++++++++++++++++++++------------------
 sources       |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3702a2d..c926a6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ clog
 /composer-1.5.3-de0c4af.tar.gz
 /composer-1.5.4-73aa733.tar.gz
 /composer-1.5.5-aab6229.tar.gz
+/composer-1.5.6-4f7f9c1.tar.gz
diff --git a/composer.spec b/composer.spec
index 100878f..f6591d4 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    aab6229c9a4b6731f23b36107c39f4007c290b50
+%global gh_commit    4f7f9c12753ec43f1e4629e2a71cabe81f2a4eab
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -15,8 +15,14 @@
 %global api_version  1.1.0
 #global prever       RC
 
+%if 0%{?fedora} >= 27
+%global symfony_prefix php-symfony3
+%else
+%global symfony_prefix php-symfony
+%endif
+
 Name:           composer
-Version:        1.5.5
+Version:        1.5.6
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -51,14 +57,10 @@ BuildRequires:  php-composer(seld/cli-prompt)           <  2
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(psr/log)                   <  2
 BuildRequires:  php-composer(psr/log)                   >= 1.0
-BuildRequires:  php-composer(symfony/console)           <  4
-BuildRequires:  php-composer(symfony/console)           >= 2.7
-BuildRequires:  php-composer(symfony/finder)            <  4
-BuildRequires:  php-composer(symfony/finder)            >= 2.7
-BuildRequires:  php-composer(symfony/filesystem)        <  4
-BuildRequires:  php-composer(symfony/filesystem)        >= 2.7
-BuildRequires:  php-composer(symfony/process)           <  4
-BuildRequires:  php-composer(symfony/process)           >= 2.7
+BuildRequires:  %{symfony_prefix}-console
+BuildRequires:  %{symfony_prefix}-finder
+BuildRequires:  %{symfony_prefix}-filesystem
+BuildRequires:  %{symfony_prefix}-process
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^4.5 || ^5.0.5",
@@ -102,14 +104,10 @@ Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(psr/log)                   >= 1.0
 Requires:       php-composer(psr/log)                   <  2
-Requires:       php-composer(symfony/console)           >= 2.7
-Requires:       php-composer(symfony/console)           <  4
-Requires:       php-composer(symfony/finder)            >= 2.7
-Requires:       php-composer(symfony/finder)            <  4
-Requires:       php-composer(symfony/process)           >= 2.7
-Requires:       php-composer(symfony/process)           <  4
-Requires:       php-composer(symfony/filesystem)        >= 2.7
-Requires:       php-composer(symfony/filesystem)        <  4
+Requires:       %{symfony_prefix}-console
+Requires:       %{symfony_prefix}-finder
+Requires:       %{symfony_prefix}-process
+Requires:       %{symfony_prefix}-filesystem
 # From composer.json, suggest
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages"
@@ -258,6 +256,10 @@ exit $ret
 
 
 %changelog
+* Mon Dec 18 2017 Remi Collet <remi@remirepo.net> - 1.5.6-1
+- Update to 1.5.6
+- switch to symfony package names
+
 * Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.5-1
 - Update to 1.5.5
 
diff --git a/sources b/sources
index 0ed945d..d040cb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.5-aab6229.tar.gz) = 29b1e2374412b753ba324436b24fda007434e87cc8ed616f7c31f70efd3ff1024a7b468c8d44285a7e394baa4e4d205c418fe97569731699a06fc06068fbd5aa
+SHA512 (composer-1.5.6-4f7f9c1.tar.gz) = f1df0e9ee7ec23dea8564ac124ed5ac0ee219085c64fbbc3ee5aa0e12e58cd63d4afb4eb9df834e60adcccfd921f783ce317bf0c1b5f9d4015895b91aa7658c2

From 2812b531c6e8f1219240672f15b260d0ce63f544 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 18 Dec 2017 15:27:25 +0100
Subject: [PATCH 082/269] Update to 1.5.6 switch to symfony package names

(cherry picked from commit 7d2626d11c68b5256e7c1291add541e2d75f6278)
---
 .gitignore    |  1 +
 composer.spec | 38 ++++++++++++++++++++------------------
 sources       |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3702a2d..c926a6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ clog
 /composer-1.5.3-de0c4af.tar.gz
 /composer-1.5.4-73aa733.tar.gz
 /composer-1.5.5-aab6229.tar.gz
+/composer-1.5.6-4f7f9c1.tar.gz
diff --git a/composer.spec b/composer.spec
index bfa57c2..732e114 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    aab6229c9a4b6731f23b36107c39f4007c290b50
+%global gh_commit    4f7f9c12753ec43f1e4629e2a71cabe81f2a4eab
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -15,8 +15,14 @@
 %global api_version  1.1.0
 #global prever       RC
 
+%if 0%{?fedora} >= 27
+%global symfony_prefix php-symfony3
+%else
+%global symfony_prefix php-symfony
+%endif
+
 Name:           composer
-Version:        1.5.5
+Version:        1.5.6
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
@@ -51,14 +57,10 @@ BuildRequires:  php-composer(seld/cli-prompt)           <  2
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(psr/log)                   <  2
 BuildRequires:  php-composer(psr/log)                   >= 1.0
-BuildRequires:  php-composer(symfony/console)           <  4
-BuildRequires:  php-composer(symfony/console)           >= 2.7
-BuildRequires:  php-composer(symfony/finder)            <  4
-BuildRequires:  php-composer(symfony/finder)            >= 2.7
-BuildRequires:  php-composer(symfony/filesystem)        <  4
-BuildRequires:  php-composer(symfony/filesystem)        >= 2.7
-BuildRequires:  php-composer(symfony/process)           <  4
-BuildRequires:  php-composer(symfony/process)           >= 2.7
+BuildRequires:  %{symfony_prefix}-console
+BuildRequires:  %{symfony_prefix}-finder
+BuildRequires:  %{symfony_prefix}-filesystem
+BuildRequires:  %{symfony_prefix}-process
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^4.5 || ^5.0.5",
@@ -102,14 +104,10 @@ Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(psr/log)                   >= 1.0
 Requires:       php-composer(psr/log)                   <  2
-Requires:       php-composer(symfony/console)           >= 2.7
-Requires:       php-composer(symfony/console)           <  4
-Requires:       php-composer(symfony/finder)            >= 2.7
-Requires:       php-composer(symfony/finder)            <  4
-Requires:       php-composer(symfony/process)           >= 2.7
-Requires:       php-composer(symfony/process)           <  4
-Requires:       php-composer(symfony/filesystem)        >= 2.7
-Requires:       php-composer(symfony/filesystem)        <  4
+Requires:       %{symfony_prefix}-console
+Requires:       %{symfony_prefix}-finder
+Requires:       %{symfony_prefix}-process
+Requires:       %{symfony_prefix}-filesystem
 # From composer.json, suggest
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages"
@@ -258,6 +256,10 @@ exit $ret
 
 
 %changelog
+* Mon Dec 18 2017 Remi Collet <remi@remirepo.net> - 1.5.6-1
+- Update to 1.5.6
+- switch to symfony package names
+
 * Fri Dec  1 2017 Remi Collet <remi@remirepo.net> - 1.5.5-1
 - Update to 1.5.5
 
diff --git a/sources b/sources
index 0ed945d..d040cb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.5-aab6229.tar.gz) = 29b1e2374412b753ba324436b24fda007434e87cc8ed616f7c31f70efd3ff1024a7b468c8d44285a7e394baa4e4d205c418fe97569731699a06fc06068fbd5aa
+SHA512 (composer-1.5.6-4f7f9c1.tar.gz) = f1df0e9ee7ec23dea8564ac124ed5ac0ee219085c64fbbc3ee5aa0e12e58cd63d4afb4eb9df834e60adcccfd921f783ce317bf0c1b5f9d4015895b91aa7658c2

From d37a2cbc127c3b6a0a07480d422e53342610dde0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 4 Jan 2018 14:36:05 +0100
Subject: [PATCH 083/269] open https://github.com/composer/composer/pull/6974  
 Fix dependency on composer/spdx-licenses raise dependency on
 composer/spdx-licenses 1.2

---
 .gitignore            |  1 +
 composer-autoload.php | 21 +++++++++++----------
 composer.spec         | 38 ++++++++++++++++++++++++--------------
 makesrc.sh            | 28 ++++++++++++++++++++++++++++
 sources               |  2 +-
 5 files changed, 65 insertions(+), 25 deletions(-)
 create mode 100755 makesrc.sh

diff --git a/.gitignore b/.gitignore
index c926a6b..e8ebb8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ clog
 /composer-1.5.4-73aa733.tar.gz
 /composer-1.5.5-aab6229.tar.gz
 /composer-1.5.6-4f7f9c1.tar.gz
+/composer-1.6.0-87f845d.tgz
diff --git a/composer-autoload.php b/composer-autoload.php
index f1f20ac..6bead2e 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -7,23 +7,24 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__);
 
 // Dependencies
-\Fedora\Autoloader\Dependencies::required(array(
-	array(
+\Fedora\Autoloader\Dependencies::required([
+	[
+		$vendorDir . '/Symfony4/Component/Console/autoload.php',
 		$vendorDir . '/Symfony3/Component/Console/autoload.php',
 		$vendorDir . '/Symfony/Component/Console/autoload.php',
-	),
-	array(
+	], [
+		$vendorDir . '/Symfony4/Component/Finder/autoload.php',
 		$vendorDir . '/Symfony3/Component/Finder/autoload.php',
 		$vendorDir . '/Symfony/Component/Finder/autoload.php',
-	),
-	array(
+	], [
+		$vendorDir . '/Symfony4/Component/Process/autoload.php',
 		$vendorDir . '/Symfony3/Component/Process/autoload.php',
 		$vendorDir . '/Symfony/Component/Process/autoload.php',
-	),
-	array(
+	], [
+		$vendorDir . '/Symfony4/Component/Filesystem/autoload.php',
 		$vendorDir . '/Symfony3/Component/Filesystem/autoload.php',
 		$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
-	),
+	],
 	$vendorDir . '/Seld/JsonLint/autoload.php',
 	$vendorDir . '/Seld/PharUtils/autoload.php',
 	$vendorDir . '/Seld/CliPrompt/autoload.php',
@@ -32,5 +33,5 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 	$vendorDir . '/Composer/Semver/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
 	$vendorDir . '/JsonSchema5/autoload.php',
-));
+]);
 
diff --git a/composer.spec b/composer.spec
index f6591d4..ba0608c 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,14 +6,16 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    4f7f9c12753ec43f1e4629e2a71cabe81f2a4eab
+%global gh_commit    87f845d1c14aa22819c51b367ad7e07823f2e2ec
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
-#global prever       RC
+
+%global upstream_version 1.6.0
+#global upstream_prever  RC
 
 %if 0%{?fedora} >= 27
 %global symfony_prefix php-symfony3
@@ -22,19 +24,21 @@
 %endif
 
 Name:           composer
-Version:        1.5.6
-Release:        1%{?dist}
+Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
 License:        MIT
 URL:            https://getcomposer.org/
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
+Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
 Source1:        %{name}-autoload.php
 Source2:        %{name}-bootstrap.php
 # Profile scripts
 Source3:        %{name}.sh
 Source4:        %{name}.csh
+# Get a git snapshot to retrieve the test suite
+Source5:        makesrc.sh
 
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
@@ -44,7 +48,7 @@ BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-justinrainbow-json-schema5
 BuildRequires:  php-composer(composer/spdx-licenses)    <  2
-BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
+BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
 BuildRequires:  php-composer(composer/ca-bundle)        <  2
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           <  2
@@ -63,9 +67,9 @@ BuildRequires:  %{symfony_prefix}-filesystem
 BuildRequires:  %{symfony_prefix}-process
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^4.5 || ^5.0.5",
+#        "phpunit/phpunit": "^4.8.35 || ^5.7",
 #        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
-BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
+BuildRequires:  php-composer(phpunit/phpunit)           >= 4.8.35
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
@@ -80,17 +84,18 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.0",
 #        "seld/jsonlint": "~1.4",
-#        "symfony/console": "^2.7 || ^3.0",
-#        "symfony/finder": "^2.7 || ^3.0",
-#        "symfony/process": "^2.7 || ^3.0",
-#        "symfony/filesystem": "^2.7 || ^3.0",
+#        "symfony/console": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/process": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
 #        "seld/phar-utils": "^1.0",
 #        "seld/cli-prompt": "^1.0",
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
-Requires:       php-composer(composer/spdx-licenses)    >= 1.0
+# See https://github.com/composer/composer/pull/6974
+Requires:       php-composer(composer/spdx-licenses)    >= 1.2
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
 Requires:       php-composer(composer/ca-bundle)        <  2
@@ -231,7 +236,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php70 php71 php72; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -256,6 +261,11 @@ exit $ret
 
 
 %changelog
+* Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.6.0-2
+- open https://github.com/composer/composer/pull/6974
+  Fix dependency on composer/spdx-licenses
+- raise dependency on composer/spdx-licenses 1.2
+
 * Mon Dec 18 2017 Remi Collet <remi@remirepo.net> - 1.5.6-1
 - Update to 1.5.6
 - switch to symfony package names
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..9615a91
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(sed    -n '/^Name:/{s/.* //;p}'                  *.spec)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec)
+PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n"
+
+echo "Cloning..."
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/sources b/sources
index d040cb4..42b85aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.6-4f7f9c1.tar.gz) = f1df0e9ee7ec23dea8564ac124ed5ac0ee219085c64fbbc3ee5aa0e12e58cd63d4afb4eb9df834e60adcccfd921f783ce317bf0c1b5f9d4015895b91aa7658c2
+SHA512 (composer-1.6.0-87f845d.tgz) = 92f76db3e891db8ddf35617222b9eb4856f2fe974059d1a4addda0fddcc0ec6132654bae9e891e6411efed80eb031c5532769f38bff2ce57173f486c0ac6cbc5

From 3dcd9d92d4891d1d50ec08418abd73372c364900 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 4 Jan 2018 14:36:05 +0100
Subject: [PATCH 084/269] open https://github.com/composer/composer/pull/6974  
 Fix dependency on composer/spdx-licenses raise dependency on
 composer/spdx-licenses 1.2

(cherry picked from commit d37a2cbc127c3b6a0a07480d422e53342610dde0)
---
 .gitignore            |  1 +
 composer-autoload.php | 21 +++++++++++----------
 composer.spec         | 38 ++++++++++++++++++++++++--------------
 makesrc.sh            | 28 ++++++++++++++++++++++++++++
 sources               |  2 +-
 5 files changed, 65 insertions(+), 25 deletions(-)
 create mode 100755 makesrc.sh

diff --git a/.gitignore b/.gitignore
index c926a6b..e8ebb8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ clog
 /composer-1.5.4-73aa733.tar.gz
 /composer-1.5.5-aab6229.tar.gz
 /composer-1.5.6-4f7f9c1.tar.gz
+/composer-1.6.0-87f845d.tgz
diff --git a/composer-autoload.php b/composer-autoload.php
index f1f20ac..6bead2e 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -7,23 +7,24 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__);
 
 // Dependencies
-\Fedora\Autoloader\Dependencies::required(array(
-	array(
+\Fedora\Autoloader\Dependencies::required([
+	[
+		$vendorDir . '/Symfony4/Component/Console/autoload.php',
 		$vendorDir . '/Symfony3/Component/Console/autoload.php',
 		$vendorDir . '/Symfony/Component/Console/autoload.php',
-	),
-	array(
+	], [
+		$vendorDir . '/Symfony4/Component/Finder/autoload.php',
 		$vendorDir . '/Symfony3/Component/Finder/autoload.php',
 		$vendorDir . '/Symfony/Component/Finder/autoload.php',
-	),
-	array(
+	], [
+		$vendorDir . '/Symfony4/Component/Process/autoload.php',
 		$vendorDir . '/Symfony3/Component/Process/autoload.php',
 		$vendorDir . '/Symfony/Component/Process/autoload.php',
-	),
-	array(
+	], [
+		$vendorDir . '/Symfony4/Component/Filesystem/autoload.php',
 		$vendorDir . '/Symfony3/Component/Filesystem/autoload.php',
 		$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
-	),
+	],
 	$vendorDir . '/Seld/JsonLint/autoload.php',
 	$vendorDir . '/Seld/PharUtils/autoload.php',
 	$vendorDir . '/Seld/CliPrompt/autoload.php',
@@ -32,5 +33,5 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 	$vendorDir . '/Composer/Semver/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
 	$vendorDir . '/JsonSchema5/autoload.php',
-));
+]);
 
diff --git a/composer.spec b/composer.spec
index 732e114..b99c6eb 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,14 +6,16 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    4f7f9c12753ec43f1e4629e2a71cabe81f2a4eab
+%global gh_commit    87f845d1c14aa22819c51b367ad7e07823f2e2ec
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
-#global prever       RC
+
+%global upstream_version 1.6.0
+#global upstream_prever  RC
 
 %if 0%{?fedora} >= 27
 %global symfony_prefix php-symfony3
@@ -22,19 +24,21 @@
 %endif
 
 Name:           composer
-Version:        1.5.6
-Release:        1%{?dist}
+Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
 License:        MIT
 URL:            https://getcomposer.org/
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz
+Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
 Source1:        %{name}-autoload.php
 Source2:        %{name}-bootstrap.php
 # Profile scripts
 Source3:        %{name}.sh
 Source4:        %{name}.csh
+# Get a git snapshot to retrieve the test suite
+Source5:        makesrc.sh
 
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
@@ -44,7 +48,7 @@ BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-justinrainbow-json-schema5
 BuildRequires:  php-composer(composer/spdx-licenses)    <  2
-BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
+BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
 BuildRequires:  php-composer(composer/ca-bundle)        <  2
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           <  2
@@ -63,9 +67,9 @@ BuildRequires:  %{symfony_prefix}-filesystem
 BuildRequires:  %{symfony_prefix}-process
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^4.5 || ^5.0.5",
+#        "phpunit/phpunit": "^4.8.35 || ^5.7",
 #        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
-BuildRequires:  php-composer(phpunit/phpunit)           >= 4.5
+BuildRequires:  php-composer(phpunit/phpunit)           >= 4.8.35
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
@@ -80,17 +84,18 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.0",
 #        "seld/jsonlint": "~1.4",
-#        "symfony/console": "^2.7 || ^3.0",
-#        "symfony/finder": "^2.7 || ^3.0",
-#        "symfony/process": "^2.7 || ^3.0",
-#        "symfony/filesystem": "^2.7 || ^3.0",
+#        "symfony/console": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/process": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
 #        "seld/phar-utils": "^1.0",
 #        "seld/cli-prompt": "^1.0",
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
-Requires:       php-composer(composer/spdx-licenses)    >= 1.0
+# See https://github.com/composer/composer/pull/6974
+Requires:       php-composer(composer/spdx-licenses)    >= 1.2
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
 Requires:       php-composer(composer/ca-bundle)        <  2
@@ -231,7 +236,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php70 php71 php72; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -256,6 +261,11 @@ exit $ret
 
 
 %changelog
+* Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.6.0-2
+- open https://github.com/composer/composer/pull/6974
+  Fix dependency on composer/spdx-licenses
+- raise dependency on composer/spdx-licenses 1.2
+
 * Mon Dec 18 2017 Remi Collet <remi@remirepo.net> - 1.5.6-1
 - Update to 1.5.6
 - switch to symfony package names
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..9615a91
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(sed    -n '/^Name:/{s/.* //;p}'                  *.spec)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec)
+PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n"
+
+echo "Cloning..."
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/sources b/sources
index d040cb4..42b85aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.5.6-4f7f9c1.tar.gz) = f1df0e9ee7ec23dea8564ac124ed5ac0ee219085c64fbbc3ee5aa0e12e58cd63d4afb4eb9df834e60adcccfd921f783ce317bf0c1b5f9d4015895b91aa7658c2
+SHA512 (composer-1.6.0-87f845d.tgz) = 92f76db3e891db8ddf35617222b9eb4856f2fe974059d1a4addda0fddcc0ec6132654bae9e891e6411efed80eb031c5532769f38bff2ce57173f486c0ac6cbc5

From 5fc4f3ba223ac11f776dd9d78e8080ab89a7c28a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 4 Jan 2018 14:58:20 +0100
Subject: [PATCH 085/269] v1.6.1

---
 .gitignore    |  1 +
 composer.spec | 12 +++++++-----
 sources       |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8ebb8c..461048e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ clog
 /composer-1.5.5-aab6229.tar.gz
 /composer-1.5.6-4f7f9c1.tar.gz
 /composer-1.6.0-87f845d.tgz
+/composer-1.6.1-9445e12.tgz
diff --git a/composer.spec b/composer.spec
index ba0608c..f92866d 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    87f845d1c14aa22819c51b367ad7e07823f2e2ec
+%global gh_commit    9445e12fb3b3db0c4aaeb8e492dd90c2a42b493c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -14,7 +14,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.0
+%global upstream_version 1.6.1
 #global upstream_prever  RC
 
 %if 0%{?fedora} >= 27
@@ -25,7 +25,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -82,7 +82,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
-#        "composer/spdx-licenses": "^1.0",
+#        "composer/spdx-licenses": "^1.2",
 #        "seld/jsonlint": "~1.4",
 #        "symfony/console": "^2.7 || ^3.0 || ^4.0",
 #        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
@@ -94,7 +94,6 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
-# See https://github.com/composer/composer/pull/6974
 Requires:       php-composer(composer/spdx-licenses)    >= 1.2
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -261,6 +260,9 @@ exit $ret
 
 
 %changelog
+* Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.6.1-1
+- Update to 1.6.1
+
 * Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.6.0-2
 - open https://github.com/composer/composer/pull/6974
   Fix dependency on composer/spdx-licenses
diff --git a/sources b/sources
index 42b85aa..7023141 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.0-87f845d.tgz) = 92f76db3e891db8ddf35617222b9eb4856f2fe974059d1a4addda0fddcc0ec6132654bae9e891e6411efed80eb031c5532769f38bff2ce57173f486c0ac6cbc5
+SHA512 (composer-1.6.1-9445e12.tgz) = 3a706486447d482bd76c66a876231496417072f68410c5a6ac7ee20d47bddcb78cf6aa585c678f47c58ce9000914dfa9817e9e37286ebca3751f7fa48af4fafa

From 31639408c775e1f13c24a8c0c19c533c067b6988 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 4 Jan 2018 14:58:20 +0100
Subject: [PATCH 086/269] v1.6.1

(cherry picked from commit 5fc4f3ba223ac11f776dd9d78e8080ab89a7c28a)
---
 .gitignore    |  1 +
 composer.spec | 12 +++++++-----
 sources       |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8ebb8c..461048e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ clog
 /composer-1.5.5-aab6229.tar.gz
 /composer-1.5.6-4f7f9c1.tar.gz
 /composer-1.6.0-87f845d.tgz
+/composer-1.6.1-9445e12.tgz
diff --git a/composer.spec b/composer.spec
index b99c6eb..52585a9 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    87f845d1c14aa22819c51b367ad7e07823f2e2ec
+%global gh_commit    9445e12fb3b3db0c4aaeb8e492dd90c2a42b493c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -14,7 +14,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.0
+%global upstream_version 1.6.1
 #global upstream_prever  RC
 
 %if 0%{?fedora} >= 27
@@ -25,7 +25,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -82,7 +82,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
-#        "composer/spdx-licenses": "^1.0",
+#        "composer/spdx-licenses": "^1.2",
 #        "seld/jsonlint": "~1.4",
 #        "symfony/console": "^2.7 || ^3.0 || ^4.0",
 #        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
@@ -94,7 +94,6 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
-# See https://github.com/composer/composer/pull/6974
 Requires:       php-composer(composer/spdx-licenses)    >= 1.2
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -261,6 +260,9 @@ exit $ret
 
 
 %changelog
+* Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.6.1-1
+- Update to 1.6.1
+
 * Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.6.0-2
 - open https://github.com/composer/composer/pull/6974
   Fix dependency on composer/spdx-licenses
diff --git a/sources b/sources
index 42b85aa..7023141 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.0-87f845d.tgz) = 92f76db3e891db8ddf35617222b9eb4856f2fe974059d1a4addda0fddcc0ec6132654bae9e891e6411efed80eb031c5532769f38bff2ce57173f486c0ac6cbc5
+SHA512 (composer-1.6.1-9445e12.tgz) = 3a706486447d482bd76c66a876231496417072f68410c5a6ac7ee20d47bddcb78cf6aa585c678f47c58ce9000914dfa9817e9e37286ebca3751f7fa48af4fafa

From 87478494d4a0510fd42cd07e9e8397f8164f724e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 8 Jan 2018 09:42:28 +0100
Subject: [PATCH 087/269] v1.6.2

---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 461048e..a0f4bae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ clog
 /composer-1.5.6-4f7f9c1.tar.gz
 /composer-1.6.0-87f845d.tgz
 /composer-1.6.1-9445e12.tgz
+/composer-1.6.2-db191ab.tgz
diff --git a/composer.spec b/composer.spec
index f92866d..74a3360 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    9445e12fb3b3db0c4aaeb8e492dd90c2a42b493c
+%global gh_commit    db191abd24b0be110c98ba2271ca992e1c70962f
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -14,7 +14,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.1
+%global upstream_version 1.6.2
 #global upstream_prever  RC
 
 %if 0%{?fedora} >= 27
@@ -260,6 +260,9 @@ exit $ret
 
 
 %changelog
+* Sun Jan  7 2018 Remi Collet <remi@remirepo.net> - 1.6.2-1
+- Update to 1.6.2
+
 * Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.6.1-1
 - Update to 1.6.1
 
diff --git a/sources b/sources
index 7023141..2fb0977 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.1-9445e12.tgz) = 3a706486447d482bd76c66a876231496417072f68410c5a6ac7ee20d47bddcb78cf6aa585c678f47c58ce9000914dfa9817e9e37286ebca3751f7fa48af4fafa
+SHA512 (composer-1.6.2-db191ab.tgz) = 3e3b6049dd4e4127aad467e1d75f1ff6183124c1e55e17c7f5ec064239ff605f18623238996e190807daff18f8241e0f7c4d097326c0a7ff5bd7c8195d0bab5f

From ca67cbcb39f37a607f6349e7cf077756087b3d92 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 8 Jan 2018 09:42:28 +0100
Subject: [PATCH 088/269] v1.6.2

(cherry picked from commit 87478494d4a0510fd42cd07e9e8397f8164f724e)
---
 .gitignore    | 1 +
 composer.spec | 7 +++++--
 sources       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 461048e..a0f4bae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ clog
 /composer-1.5.6-4f7f9c1.tar.gz
 /composer-1.6.0-87f845d.tgz
 /composer-1.6.1-9445e12.tgz
+/composer-1.6.2-db191ab.tgz
diff --git a/composer.spec b/composer.spec
index 52585a9..95ac435 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    9445e12fb3b3db0c4aaeb8e492dd90c2a42b493c
+%global gh_commit    db191abd24b0be110c98ba2271ca992e1c70962f
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -14,7 +14,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.1
+%global upstream_version 1.6.2
 #global upstream_prever  RC
 
 %if 0%{?fedora} >= 27
@@ -260,6 +260,9 @@ exit $ret
 
 
 %changelog
+* Sun Jan  7 2018 Remi Collet <remi@remirepo.net> - 1.6.2-1
+- Update to 1.6.2
+
 * Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.6.1-1
 - Update to 1.6.1
 
diff --git a/sources b/sources
index 7023141..2fb0977 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.1-9445e12.tgz) = 3a706486447d482bd76c66a876231496417072f68410c5a6ac7ee20d47bddcb78cf6aa585c678f47c58ce9000914dfa9817e9e37286ebca3751f7fa48af4fafa
+SHA512 (composer-1.6.2-db191ab.tgz) = 3e3b6049dd4e4127aad467e1d75f1ff6183124c1e55e17c7f5ec064239ff605f18623238996e190807daff18f8241e0f7c4d097326c0a7ff5bd7c8195d0bab5f

From f6355642c6238e353393049cbdbdbc5b9b0d8a10 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 1 Feb 2018 06:21:15 +0100
Subject: [PATCH 089/269] v1.6.3

---
 .gitignore    |  1 +
 composer.spec | 29 ++++++++++++++++++++++++++---
 sources       |  2 +-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index a0f4bae..563fe83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ clog
 /composer-1.6.0-87f845d.tgz
 /composer-1.6.1-9445e12.tgz
 /composer-1.6.2-db191ab.tgz
+/composer-1.6.3-88a69fd.tgz
diff --git a/composer.spec b/composer.spec
index 74a3360..4ecb163 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    db191abd24b0be110c98ba2271ca992e1c70962f
+%global gh_commit    88a69fda0f2187ad8714cedffd7a8872dceaa4c2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -14,7 +14,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.2
+%global upstream_version 1.6.3
 #global upstream_prever  RC
 
 %if 0%{?fedora} >= 27
@@ -47,6 +47,15 @@ BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-justinrainbow-json-schema5
+%if 0%{?fedora} >= 27
+BuildRequires:  (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
+BuildRequires:  (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
+BuildRequires:  (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
+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(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
+BuildRequires:  (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
+%else
 BuildRequires:  php-composer(composer/spdx-licenses)    <  2
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
 BuildRequires:  php-composer(composer/ca-bundle)        <  2
@@ -61,6 +70,7 @@ BuildRequires:  php-composer(seld/cli-prompt)           <  2
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(psr/log)                   <  2
 BuildRequires:  php-composer(psr/log)                   >= 1.0
+%endif
 BuildRequires:  %{symfony_prefix}-console
 BuildRequires:  %{symfony_prefix}-finder
 BuildRequires:  %{symfony_prefix}-filesystem
@@ -94,6 +104,15 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
+%if 0%{?fedora} >= 27
+Requires:       (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
+Requires:       (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
+Requires:       (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
+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(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
+Requires:       (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
+%else
 Requires:       php-composer(composer/spdx-licenses)    >= 1.2
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -108,6 +127,7 @@ Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(psr/log)                   >= 1.0
 Requires:       php-composer(psr/log)                   <  2
+%endif
 Requires:       %{symfony_prefix}-console
 Requires:       %{symfony_prefix}-finder
 Requires:       %{symfony_prefix}-process
@@ -260,6 +280,9 @@ exit $ret
 
 
 %changelog
+* Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 1.6.3-1
+- Update to 1.6.3
+
 * Sun Jan  7 2018 Remi Collet <remi@remirepo.net> - 1.6.2-1
 - Update to 1.6.2
 
diff --git a/sources b/sources
index 2fb0977..48e9b06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.2-db191ab.tgz) = 3e3b6049dd4e4127aad467e1d75f1ff6183124c1e55e17c7f5ec064239ff605f18623238996e190807daff18f8241e0f7c4d097326c0a7ff5bd7c8195d0bab5f
+SHA512 (composer-1.6.3-88a69fd.tgz) = c9e74f585c858fc0d5e26f30585ab595099dbc3020b7fd02eefd117875d07bc4a6da7a214160991b26510996968c471477bc7dc7d4b1e1d03162ed6d0da1a0f3

From ae53a133a8c20b4611d1ebaba5e7624012990112 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 1 Feb 2018 06:21:15 +0100
Subject: [PATCH 090/269] v1.6.3

(cherry picked from commit f6355642c6238e353393049cbdbdbc5b9b0d8a10)
---
 .gitignore    |  1 +
 composer.spec | 29 ++++++++++++++++++++++++++---
 sources       |  2 +-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index a0f4bae..563fe83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ clog
 /composer-1.6.0-87f845d.tgz
 /composer-1.6.1-9445e12.tgz
 /composer-1.6.2-db191ab.tgz
+/composer-1.6.3-88a69fd.tgz
diff --git a/composer.spec b/composer.spec
index 95ac435..01adaf9 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    db191abd24b0be110c98ba2271ca992e1c70962f
+%global gh_commit    88a69fda0f2187ad8714cedffd7a8872dceaa4c2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -14,7 +14,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.2
+%global upstream_version 1.6.3
 #global upstream_prever  RC
 
 %if 0%{?fedora} >= 27
@@ -47,6 +47,15 @@ BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-justinrainbow-json-schema5
+%if 0%{?fedora} >= 27
+BuildRequires:  (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
+BuildRequires:  (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
+BuildRequires:  (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
+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(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
+BuildRequires:  (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
+%else
 BuildRequires:  php-composer(composer/spdx-licenses)    <  2
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
 BuildRequires:  php-composer(composer/ca-bundle)        <  2
@@ -61,6 +70,7 @@ BuildRequires:  php-composer(seld/cli-prompt)           <  2
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(psr/log)                   <  2
 BuildRequires:  php-composer(psr/log)                   >= 1.0
+%endif
 BuildRequires:  %{symfony_prefix}-console
 BuildRequires:  %{symfony_prefix}-finder
 BuildRequires:  %{symfony_prefix}-filesystem
@@ -94,6 +104,15 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
+%if 0%{?fedora} >= 27
+Requires:       (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
+Requires:       (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
+Requires:       (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
+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(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
+Requires:       (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
+%else
 Requires:       php-composer(composer/spdx-licenses)    >= 1.2
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -108,6 +127,7 @@ Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(psr/log)                   >= 1.0
 Requires:       php-composer(psr/log)                   <  2
+%endif
 Requires:       %{symfony_prefix}-console
 Requires:       %{symfony_prefix}-finder
 Requires:       %{symfony_prefix}-process
@@ -260,6 +280,9 @@ exit $ret
 
 
 %changelog
+* Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 1.6.3-1
+- Update to 1.6.3
+
 * Sun Jan  7 2018 Remi Collet <remi@remirepo.net> - 1.6.2-1
 - Update to 1.6.2
 
diff --git a/sources b/sources
index 2fb0977..48e9b06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.2-db191ab.tgz) = 3e3b6049dd4e4127aad467e1d75f1ff6183124c1e55e17c7f5ec064239ff605f18623238996e190807daff18f8241e0f7c4d097326c0a7ff5bd7c8195d0bab5f
+SHA512 (composer-1.6.3-88a69fd.tgz) = c9e74f585c858fc0d5e26f30585ab595099dbc3020b7fd02eefd117875d07bc4a6da7a214160991b26510996968c471477bc7dc7d4b1e1d03162ed6d0da1a0f3

From effdaab92844cf4d9b09725eef1309c05a171b30 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 1 Feb 2018 06:42:09 +0100
Subject: [PATCH 091/269] undefine __brp_mangle_shebangs (F28)

---
 composer.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 4ecb163..8a2e7c7 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,6 +6,10 @@
 #
 # Please, preserve the changelog entries
 #
+
+# For compatibility with SCL
+%undefine __brp_mangle_shebangs
+
 %global gh_commit    88a69fda0f2187ad8714cedffd7a8872dceaa4c2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
@@ -25,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -280,6 +284,9 @@ exit $ret
 
 
 %changelog
+* Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 1.6.3-2
+- undefine __brp_mangle_shebangs (F28)
+
 * Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 1.6.3-1
 - Update to 1.6.3
 

From 173668f9f4ff002e6ffc56d3c24df2115e602467 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 05:35:07 +0000
Subject: [PATCH 092/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 8a2e7c7..c73ec02 100644
--- a/composer.spec
+++ b/composer.spec
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -284,6 +284,9 @@ exit $ret
 
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 1.6.3-2
 - undefine __brp_mangle_shebangs (F28)
 

From eb6c4ddf21afeb0de626359d17d649d7e7b3e43b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 20 Feb 2018 14:19:44 +0100
Subject: [PATCH 093/269] switch to Symfony2 only

---
 composer-autoload.php | 21 ++++-----------------
 composer.spec         |  8 ++++++--
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/composer-autoload.php b/composer-autoload.php
index 6bead2e..04b2616 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -8,23 +8,10 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 
 // Dependencies
 \Fedora\Autoloader\Dependencies::required([
-	[
-		$vendorDir . '/Symfony4/Component/Console/autoload.php',
-		$vendorDir . '/Symfony3/Component/Console/autoload.php',
-		$vendorDir . '/Symfony/Component/Console/autoload.php',
-	], [
-		$vendorDir . '/Symfony4/Component/Finder/autoload.php',
-		$vendorDir . '/Symfony3/Component/Finder/autoload.php',
-		$vendorDir . '/Symfony/Component/Finder/autoload.php',
-	], [
-		$vendorDir . '/Symfony4/Component/Process/autoload.php',
-		$vendorDir . '/Symfony3/Component/Process/autoload.php',
-		$vendorDir . '/Symfony/Component/Process/autoload.php',
-	], [
-		$vendorDir . '/Symfony4/Component/Filesystem/autoload.php',
-		$vendorDir . '/Symfony3/Component/Filesystem/autoload.php',
-		$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
-	],
+	$vendorDir . '/Symfony/Component/Console/autoload.php',
+	$vendorDir . '/Symfony/Component/Finder/autoload.php',
+	$vendorDir . '/Symfony/Component/Process/autoload.php',
+	$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
 	$vendorDir . '/Seld/JsonLint/autoload.php',
 	$vendorDir . '/Seld/PharUtils/autoload.php',
 	$vendorDir . '/Seld/CliPrompt/autoload.php',
diff --git a/composer.spec b/composer.spec
index c73ec02..5cb4cd7 100644
--- a/composer.spec
+++ b/composer.spec
@@ -21,7 +21,8 @@
 %global upstream_version 1.6.3
 #global upstream_prever  RC
 
-%if 0%{?fedora} >= 27
+%if 0
+# see https://forum.remirepo.net/viewtopic.php?id=3677
 %global symfony_prefix php-symfony3
 %else
 %global symfony_prefix php-symfony
@@ -29,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -284,6 +285,9 @@ exit $ret
 
 
 %changelog
+* Tue Feb 20 2018 Remi Collet <remi@remirepo.net> - 1.6.3-4
+- switch to Symfony2 only
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 8cc59312c596db6739bcb2a9a790b3dee91fdcbe Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 16 Apr 2018 07:36:02 +0200
Subject: [PATCH 094/269] v1.6.4

---
 .gitignore    | 1 +
 composer.spec | 9 ++++++---
 sources       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 563fe83..1a08248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ clog
 /composer-1.6.1-9445e12.tgz
 /composer-1.6.2-db191ab.tgz
 /composer-1.6.3-88a69fd.tgz
+/composer-1.6.4-86ad51e.tgz
diff --git a/composer.spec b/composer.spec
index 5cb4cd7..5d9f8a3 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    88a69fda0f2187ad8714cedffd7a8872dceaa4c2
+%global gh_commit    86ad51e8a3c64c9782446aae740a61fc6faa2522
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.3
+%global upstream_version 1.6.4
 #global upstream_prever  RC
 
 %if 0
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -285,6 +285,9 @@ exit $ret
 
 
 %changelog
+* Mon Apr 16 2018 Remi Collet <remi@remirepo.net> - 1.6.4-1
+- update to 1.6.4
+
 * Tue Feb 20 2018 Remi Collet <remi@remirepo.net> - 1.6.3-4
 - switch to Symfony2 only
 
diff --git a/sources b/sources
index 48e9b06..2717e6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.3-88a69fd.tgz) = c9e74f585c858fc0d5e26f30585ab595099dbc3020b7fd02eefd117875d07bc4a6da7a214160991b26510996968c471477bc7dc7d4b1e1d03162ed6d0da1a0f3
+SHA512 (composer-1.6.4-86ad51e.tgz) = 81bd38b44b03f43343ac7a5cbe094d5199dba33e0d4a208837e930a44cea94d58ddfbf339b8424e7db19c58f977c180d490306f316375eb5cf2d73f4c1970ee3

From ef5c17cd28e660ec20484278477e91061b162e6d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 20 Feb 2018 14:19:44 +0100
Subject: [PATCH 095/269] v1.6.4

(cherry picked from commit eb6c4ddf21afeb0de626359d17d649d7e7b3e43b)
(cherry picked from commit 96c24482dc9e81b2c838adbff8a34b65af6cdca5)
(cherry picked from commit 8cc59312c596db6739bcb2a9a790b3dee91fdcbe)
(cherry picked from commit 8a0b6a520aad19971143b43768d3020c0bdd95ea)
(cherry picked from commit 3515fc6b6738439eaa0c17c27249f0b34de1fbeb)
---
 .gitignore            |  1 +
 composer-autoload.php | 21 ++++-----------------
 composer.spec         | 14 +++++++++++---
 sources               |  2 +-
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 563fe83..1a08248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ clog
 /composer-1.6.1-9445e12.tgz
 /composer-1.6.2-db191ab.tgz
 /composer-1.6.3-88a69fd.tgz
+/composer-1.6.4-86ad51e.tgz
diff --git a/composer-autoload.php b/composer-autoload.php
index 6bead2e..04b2616 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -8,23 +8,10 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 
 // Dependencies
 \Fedora\Autoloader\Dependencies::required([
-	[
-		$vendorDir . '/Symfony4/Component/Console/autoload.php',
-		$vendorDir . '/Symfony3/Component/Console/autoload.php',
-		$vendorDir . '/Symfony/Component/Console/autoload.php',
-	], [
-		$vendorDir . '/Symfony4/Component/Finder/autoload.php',
-		$vendorDir . '/Symfony3/Component/Finder/autoload.php',
-		$vendorDir . '/Symfony/Component/Finder/autoload.php',
-	], [
-		$vendorDir . '/Symfony4/Component/Process/autoload.php',
-		$vendorDir . '/Symfony3/Component/Process/autoload.php',
-		$vendorDir . '/Symfony/Component/Process/autoload.php',
-	], [
-		$vendorDir . '/Symfony4/Component/Filesystem/autoload.php',
-		$vendorDir . '/Symfony3/Component/Filesystem/autoload.php',
-		$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
-	],
+	$vendorDir . '/Symfony/Component/Console/autoload.php',
+	$vendorDir . '/Symfony/Component/Finder/autoload.php',
+	$vendorDir . '/Symfony/Component/Process/autoload.php',
+	$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
 	$vendorDir . '/Seld/JsonLint/autoload.php',
 	$vendorDir . '/Seld/PharUtils/autoload.php',
 	$vendorDir . '/Seld/CliPrompt/autoload.php',
diff --git a/composer.spec b/composer.spec
index 01adaf9..bea8188 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,11 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    88a69fda0f2187ad8714cedffd7a8872dceaa4c2
+
+# For compatibility with SCL
+%undefine __brp_mangle_shebangs
+
+%global gh_commit    86ad51e8a3c64c9782446aae740a61fc6faa2522
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -14,10 +18,11 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.3
+%global upstream_version 1.6.4
 #global upstream_prever  RC
 
-%if 0%{?fedora} >= 27
+%if 0
+# see https://forum.remirepo.net/viewtopic.php?id=3677
 %global symfony_prefix php-symfony3
 %else
 %global symfony_prefix php-symfony
@@ -280,6 +285,9 @@ exit $ret
 
 
 %changelog
+* Mon Apr 16 2018 Remi Collet <remi@remirepo.net> - 1.6.4-1
+- update to 1.6.4
+
 * Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 1.6.3-1
 - Update to 1.6.3
 
diff --git a/sources b/sources
index 48e9b06..2717e6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.3-88a69fd.tgz) = c9e74f585c858fc0d5e26f30585ab595099dbc3020b7fd02eefd117875d07bc4a6da7a214160991b26510996968c471477bc7dc7d4b1e1d03162ed6d0da1a0f3
+SHA512 (composer-1.6.4-86ad51e.tgz) = 81bd38b44b03f43343ac7a5cbe094d5199dba33e0d4a208837e930a44cea94d58ddfbf339b8424e7db19c58f977c180d490306f316375eb5cf2d73f4c1970ee3

From bf48ffd3e83e21aea26855d641cf2d60e781434e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 4 May 2018 13:09:03 +0200
Subject: [PATCH 096/269] v1.6.5

---
 .gitignore         |  1 +
 composer-rpm.patch | 26 +++++++++++++-------------
 composer.spec      | 11 +++++++----
 sources            |  2 +-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1a08248..8d6909d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ clog
 /composer-1.6.2-db191ab.tgz
 /composer-1.6.3-88a69fd.tgz
 /composer-1.6.4-86ad51e.tgz
+/composer-1.6.5-b184a92.tgz
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 9b896a2..44eb5b1 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,18 +1,18 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2017-03-08 17:51:24.000000000 +0100
-+++ ./bin/composer	2017-03-08 19:16:24.206124958 +0100
-@@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
-     echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
+--- ./bin/composer.rpm	2018-05-04 12:59:13.065292434 +0200
++++ ./bin/composer	2018-05-04 13:00:23.293493373 +0200
+@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') {
  }
  
+ setlocale(LC_ALL, 'C');
 -require __DIR__.'/../src/bootstrap.php';
 +require '/usr/share/php/Composer/autoload.php';
  
  use Composer\Factory;
  use Composer\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2017-03-08 17:51:24.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2017-03-08 19:16:24.207124963 +0100
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-05-04 12:59:13.066292451 +0200
 @@ -305,7 +305,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2017-03-08 17:51:24.000000000 +0100
-+++ ./src/Composer/Compiler.php	2017-03-08 19:16:24.207124963 +0100
+--- ./src/Composer/Compiler.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./src/Composer/Compiler.php	2018-05-04 12:59:13.066292451 +0200
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2017-03-08 19:16:24.207124963 +0100
-+++ ./src/Composer/Json/JsonFile.php	2017-03-08 19:17:35.148449586 +0100
+--- ./src/Composer/Json/JsonFile.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2018-05-04 12:59:13.066292451 +0200
 @@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
@@ -47,9 +47,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
          if (false === strpos($schemaFile, '://')) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2017-03-08 19:16:24.207124963 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2017-03-08 19:19:02.243848127 +0100
-@@ -96,7 +96,8 @@ class ComposerSchemaTest extends \PHPUni
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-05-04 12:59:13.066292451 +0200
+@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
          $validator = new Validator();
diff --git a/composer.spec b/composer.spec
index 5d9f8a3..932bc59 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    86ad51e8a3c64c9782446aae740a61fc6faa2522
+%global gh_commit    b184a92419cc9a9c4c6a09db555a94d441cb11c9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.4
+%global upstream_version 1.6.5
 #global upstream_prever  RC
 
 %if 0
@@ -52,7 +52,7 @@ BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-justinrainbow-json-schema5
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires:  (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
 BuildRequires:  (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
 BuildRequires:  (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
@@ -109,7 +109,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:       (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
 Requires:       (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
 Requires:       (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
@@ -285,6 +285,9 @@ exit $ret
 
 
 %changelog
+* Fri May  4 2018 Remi Collet <remi@remirepo.net> - 1.6.5-1
+- update to 1.6.5
+
 * Mon Apr 16 2018 Remi Collet <remi@remirepo.net> - 1.6.4-1
 - update to 1.6.4
 
diff --git a/sources b/sources
index 2717e6f..fc7a589 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.4-86ad51e.tgz) = 81bd38b44b03f43343ac7a5cbe094d5199dba33e0d4a208837e930a44cea94d58ddfbf339b8424e7db19c58f977c180d490306f316375eb5cf2d73f4c1970ee3
+SHA512 (composer-1.6.5-b184a92.tgz) = 9aba64c856c6c0679ee2c373d2428cbc07ff791a7c673ad129e6bce36c9b69ab5d60dae8698312d063f79a35fd183d6c80cf1db0a64e06b0cf7c684b6dc5515d

From be225487f8b51644af1f510ede7c42d4ea1396a0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 4 May 2018 13:09:03 +0200
Subject: [PATCH 097/269] v1.6.5

(cherry picked from commit bf48ffd3e83e21aea26855d641cf2d60e781434e)
---
 .gitignore         |  1 +
 composer-rpm.patch | 26 +++++++++++++-------------
 composer.spec      | 11 +++++++----
 sources            |  2 +-
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1a08248..8d6909d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ clog
 /composer-1.6.2-db191ab.tgz
 /composer-1.6.3-88a69fd.tgz
 /composer-1.6.4-86ad51e.tgz
+/composer-1.6.5-b184a92.tgz
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 9b896a2..44eb5b1 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,18 +1,18 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2017-03-08 17:51:24.000000000 +0100
-+++ ./bin/composer	2017-03-08 19:16:24.206124958 +0100
-@@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
-     echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
+--- ./bin/composer.rpm	2018-05-04 12:59:13.065292434 +0200
++++ ./bin/composer	2018-05-04 13:00:23.293493373 +0200
+@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') {
  }
  
+ setlocale(LC_ALL, 'C');
 -require __DIR__.'/../src/bootstrap.php';
 +require '/usr/share/php/Composer/autoload.php';
  
  use Composer\Factory;
  use Composer\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2017-03-08 17:51:24.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2017-03-08 19:16:24.207124963 +0100
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-05-04 12:59:13.066292451 +0200
 @@ -305,7 +305,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2017-03-08 17:51:24.000000000 +0100
-+++ ./src/Composer/Compiler.php	2017-03-08 19:16:24.207124963 +0100
+--- ./src/Composer/Compiler.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./src/Composer/Compiler.php	2018-05-04 12:59:13.066292451 +0200
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2017-03-08 19:16:24.207124963 +0100
-+++ ./src/Composer/Json/JsonFile.php	2017-03-08 19:17:35.148449586 +0100
+--- ./src/Composer/Json/JsonFile.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2018-05-04 12:59:13.066292451 +0200
 @@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
@@ -47,9 +47,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
          if (false === strpos($schemaFile, '://')) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2017-03-08 19:16:24.207124963 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2017-03-08 19:19:02.243848127 +0100
-@@ -96,7 +96,8 @@ class ComposerSchemaTest extends \PHPUni
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-05-04 12:59:13.066292451 +0200
+@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
          $validator = new Validator();
diff --git a/composer.spec b/composer.spec
index bea8188..76f3efd 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    86ad51e8a3c64c9782446aae740a61fc6faa2522
+%global gh_commit    b184a92419cc9a9c4c6a09db555a94d441cb11c9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.4
+%global upstream_version 1.6.5
 #global upstream_prever  RC
 
 %if 0
@@ -52,7 +52,7 @@ BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-justinrainbow-json-schema5
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires:  (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
 BuildRequires:  (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
 BuildRequires:  (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
@@ -109,7 +109,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:       (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
 Requires:       (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
 Requires:       (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
@@ -285,6 +285,9 @@ exit $ret
 
 
 %changelog
+* Fri May  4 2018 Remi Collet <remi@remirepo.net> - 1.6.5-1
+- update to 1.6.5
+
 * Mon Apr 16 2018 Remi Collet <remi@remirepo.net> - 1.6.4-1
 - update to 1.6.4
 
diff --git a/sources b/sources
index 2717e6f..fc7a589 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.4-86ad51e.tgz) = 81bd38b44b03f43343ac7a5cbe094d5199dba33e0d4a208837e930a44cea94d58ddfbf339b8424e7db19c58f977c180d490306f316375eb5cf2d73f4c1970ee3
+SHA512 (composer-1.6.5-b184a92.tgz) = 9aba64c856c6c0679ee2c373d2428cbc07ff791a7c673ad129e6bce36c9b69ab5d60dae8698312d063f79a35fd183d6c80cf1db0a64e06b0cf7c684b6dc5515d

From 1868888b373656dc6aa70eb44df7a3bac4c06c11 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 12 Jul 2018 22:09:10 +0000
Subject: [PATCH 098/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 932bc59..aefcee5 100644
--- a/composer.spec
+++ b/composer.spec
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -285,6 +285,9 @@ exit $ret
 
 
 %changelog
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Fri May  4 2018 Remi Collet <remi@remirepo.net> - 1.6.5-1
 - update to 1.6.5
 

From a950d26931d7987c5e2ca389834de44061c3ec77 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 17 Aug 2018 08:23:18 +0200
Subject: [PATCH 099/269] update to 1.7.2 drop dependency on seld/cli-prompt
 add dependency on composer/xdebug-handler

---
 .gitignore            |  1 +
 composer-autoload.php |  2 +-
 composer-rpm.patch    | 24 +++++++++---------
 composer.spec         | 57 +++++++++++++++++++++++--------------------
 sources               |  2 +-
 5 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d6909d..ed20f1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ clog
 /composer-1.6.3-88a69fd.tgz
 /composer-1.6.4-86ad51e.tgz
 /composer-1.6.5-b184a92.tgz
+/composer-1.7.2-576aab9.tgz
diff --git a/composer-autoload.php b/composer-autoload.php
index 04b2616..15e9c21 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -14,10 +14,10 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 	$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
 	$vendorDir . '/Seld/JsonLint/autoload.php',
 	$vendorDir . '/Seld/PharUtils/autoload.php',
-	$vendorDir . '/Seld/CliPrompt/autoload.php',
 	$vendorDir . '/Composer/CaBundle/autoload.php',
 	$vendorDir . '/Composer/Spdx/autoload.php',
 	$vendorDir . '/Composer/Semver/autoload.php',
+	$vendorDir . '/Composer/XdebugHandler/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
 	$vendorDir . '/JsonSchema5/autoload.php',
 ]);
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 44eb5b1..3ed61f4 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2018-05-04 12:59:13.065292434 +0200
-+++ ./bin/composer	2018-05-04 13:00:23.293493373 +0200
+--- ./bin/composer.rpm	2018-07-26 09:44:36.765795459 +0200
++++ ./bin/composer	2018-07-26 09:45:14.199012215 +0200
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') {
  }
  
@@ -8,11 +8,11 @@ diff -up ./bin/composer.rpm ./bin/composer
 -require __DIR__.'/../src/bootstrap.php';
 +require '/usr/share/php/Composer/autoload.php';
  
- use Composer\Factory;
- use Composer\XdebugHandler;
+ use Composer\Console\Application;
+ use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-05-04 12:59:13.066292451 +0200
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-07-26 09:36:57.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-07-26 09:44:36.765795459 +0200
 @@ -305,7 +305,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./src/Composer/Compiler.php	2018-05-04 12:59:13.066292451 +0200
+--- ./src/Composer/Compiler.php.rpm	2018-07-26 09:36:57.000000000 +0200
++++ ./src/Composer/Compiler.php	2018-07-26 09:44:36.765795459 +0200
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2018-05-04 12:59:13.066292451 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2018-07-26 09:36:57.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2018-07-26 09:44:36.765795459 +0200
 @@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
@@ -47,8 +47,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
          if (false === strpos($schemaFile, '://')) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-05-04 12:59:13.066292451 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-07-26 09:36:57.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-07-26 09:44:36.765795459 +0200
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
diff --git a/composer.spec b/composer.spec
index aefcee5..98aff26 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    b184a92419cc9a9c4c6a09db555a94d441cb11c9
+%global gh_commit    576aab9b5abb2ed11a1c52353a759363216a4ad2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.5
+%global upstream_version 1.7.2
 #global upstream_prever  RC
 
 %if 0
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -53,26 +53,26 @@ BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-justinrainbow-json-schema5
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
 BuildRequires:  (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
 BuildRequires:  (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
+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)
 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(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
 BuildRequires:  (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
 %else
-BuildRequires:  php-composer(composer/spdx-licenses)    <  2
-BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
 BuildRequires:  php-composer(composer/ca-bundle)        <  2
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           <  2
 BuildRequires:  php-composer(composer/semver)           >= 1.0
+BuildRequires:  php-composer(composer/spdx-licenses)    <  2
+BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
+BuildRequires:  php-composer(composer/xdebug-handler)   >= 1.1
+BuildRequires:  php-composer(composer/xdebug-handler)   <  2
 BuildRequires:  php-composer(seld/jsonlint)             <  2
 BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
 BuildRequires:  php-composer(seld/phar-utils)           <  2
 BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
-BuildRequires:  php-composer(seld/cli-prompt)           <  2
-BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(psr/log)                   <  2
 BuildRequires:  php-composer(psr/log)                   >= 1.0
 %endif
@@ -88,48 +88,47 @@ BuildRequires:  php-composer(phpunit/phpunit)           >= 4.8.35
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
-BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
 BuildRequires:  php-PsrLog          >= 1.0.0-8
 %endif
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.2",
+#        "composer/xdebug-handler": "^1.1",
+#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+#        "psr/log": "^1.0"
 #        "seld/jsonlint": "~1.4",
+#        "seld/phar-utils": "^1.0",
 #        "symfony/console": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
 #        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
 #        "symfony/process": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-#        "seld/phar-utils": "^1.0",
-#        "seld/cli-prompt": "^1.0",
-#        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
 Requires:       (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
 Requires:       (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
+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)
 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(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
 Requires:       (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
 %else
-Requires:       php-composer(composer/spdx-licenses)    >= 1.2
-Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
 Requires:       php-composer(composer/ca-bundle)        <  2
 Requires:       php-composer(composer/semver)           >= 1.0
 Requires:       php-composer(composer/semver)           <  2
+Requires:       php-composer(composer/spdx-licenses)    >= 1.2
+Requires:       php-composer(composer/spdx-licenses)    <  2
+Requires:       php-composer(composer/xdebug-handler)   >= 1.1
+Requires:       php-composer(composer/xdebug-handler)   <  2
 Requires:       php-composer(seld/jsonlint)             >= 1.4
 Requires:       php-composer(seld/jsonlint)             <  2
 Requires:       php-composer(seld/phar-utils)           >= 1.0
 Requires:       php-composer(seld/phar-utils)           <  2
-Requires:       php-composer(seld/cli-prompt)           >= 1.0
-Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(psr/log)                   >= 1.0
 Requires:       php-composer(psr/log)                   <  2
 %endif
@@ -138,14 +137,15 @@ Requires:       %{symfony_prefix}-finder
 Requires:       %{symfony_prefix}-process
 Requires:       %{symfony_prefix}-filesystem
 # From composer.json, suggest
-#        "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
-#        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages"
-Requires:       php-zip
+#        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+#        "ext-zip": "Enabling the zip extension allows you to unzip archives",
+#        "ext-zlib": "Allow gzip compression of HTTP requests"
 Requires:       php-openssl
+Requires:       php-zip
+Requires:       php-zlib
 # For our autoloader
 Requires:       php-composer(fedora/autoloader)
 Requires:       php-seld-phar-utils >= 1.0.1
-Requires:       php-seld-cli-prompt >= 1.0.0-3
 Requires:       php-PsrLog          >= 1.0.0-8
 # From phpcompatinfo
 Requires:       php-curl
@@ -260,7 +260,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php70 php71 php72 php73; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -285,6 +285,11 @@ exit $ret
 
 
 %changelog
+* Fri Aug 17 2018 Remi Collet <remi@remirepo.net> - 1.7.2-1
+- update to 1.7.2
+- drop dependency on seld/cli-prompt
+- add dependency on composer/xdebug-handler
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index fc7a589..6879ef7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.5-b184a92.tgz) = 9aba64c856c6c0679ee2c373d2428cbc07ff791a7c673ad129e6bce36c9b69ab5d60dae8698312d063f79a35fd183d6c80cf1db0a64e06b0cf7c684b6dc5515d
+SHA512 (composer-1.7.2-576aab9.tgz) = 9352fe99c7747a75b2f59a0ed4aa1cdd69c7ef76ff707508bb05ddd9432ca50774bd9eab1471516e2e42f9dd447fa6e035676107c0fc573500a07dfb9d062d49

From 14887b950c837be7f53226101edcdab47b4252a5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 17 Aug 2018 08:23:18 +0200
Subject: [PATCH 100/269] update to 1.7.2 drop dependency on seld/cli-prompt
 add dependency on composer/xdebug-handler

(cherry picked from commit a950d26931d7987c5e2ca389834de44061c3ec77)
(cherry picked from commit 28ebc6a406591f7c45e65cdabfd56ea342408239)
---
 .gitignore            |  1 +
 composer-autoload.php |  2 +-
 composer-rpm.patch    | 24 +++++++++----------
 composer.spec         | 55 +++++++++++++++++++++++--------------------
 sources               |  2 +-
 5 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d6909d..ed20f1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ clog
 /composer-1.6.3-88a69fd.tgz
 /composer-1.6.4-86ad51e.tgz
 /composer-1.6.5-b184a92.tgz
+/composer-1.7.2-576aab9.tgz
diff --git a/composer-autoload.php b/composer-autoload.php
index 04b2616..15e9c21 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -14,10 +14,10 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 	$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
 	$vendorDir . '/Seld/JsonLint/autoload.php',
 	$vendorDir . '/Seld/PharUtils/autoload.php',
-	$vendorDir . '/Seld/CliPrompt/autoload.php',
 	$vendorDir . '/Composer/CaBundle/autoload.php',
 	$vendorDir . '/Composer/Spdx/autoload.php',
 	$vendorDir . '/Composer/Semver/autoload.php',
+	$vendorDir . '/Composer/XdebugHandler/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
 	$vendorDir . '/JsonSchema5/autoload.php',
 ]);
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 44eb5b1..3ed61f4 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2018-05-04 12:59:13.065292434 +0200
-+++ ./bin/composer	2018-05-04 13:00:23.293493373 +0200
+--- ./bin/composer.rpm	2018-07-26 09:44:36.765795459 +0200
++++ ./bin/composer	2018-07-26 09:45:14.199012215 +0200
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') {
  }
  
@@ -8,11 +8,11 @@ diff -up ./bin/composer.rpm ./bin/composer
 -require __DIR__.'/../src/bootstrap.php';
 +require '/usr/share/php/Composer/autoload.php';
  
- use Composer\Factory;
- use Composer\XdebugHandler;
+ use Composer\Console\Application;
+ use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-05-04 12:59:13.066292451 +0200
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-07-26 09:36:57.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-07-26 09:44:36.765795459 +0200
 @@ -305,7 +305,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./src/Composer/Compiler.php	2018-05-04 12:59:13.066292451 +0200
+--- ./src/Composer/Compiler.php.rpm	2018-07-26 09:36:57.000000000 +0200
++++ ./src/Composer/Compiler.php	2018-07-26 09:44:36.765795459 +0200
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2018-05-04 12:59:13.066292451 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2018-07-26 09:36:57.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2018-07-26 09:44:36.765795459 +0200
 @@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
@@ -47,8 +47,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
          if (false === strpos($schemaFile, '://')) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-05-04 12:57:41.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-05-04 12:59:13.066292451 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-07-26 09:36:57.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-07-26 09:44:36.765795459 +0200
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
diff --git a/composer.spec b/composer.spec
index 76f3efd..d25851c 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    b184a92419cc9a9c4c6a09db555a94d441cb11c9
+%global gh_commit    576aab9b5abb2ed11a1c52353a759363216a4ad2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.6.5
+%global upstream_version 1.7.2
 #global upstream_prever  RC
 
 %if 0
@@ -53,26 +53,26 @@ BuildRequires:  php-cli
 %if %{with_tests}
 BuildRequires:  php-justinrainbow-json-schema5
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
 BuildRequires:  (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
 BuildRequires:  (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
+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)
 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(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
 BuildRequires:  (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
 %else
-BuildRequires:  php-composer(composer/spdx-licenses)    <  2
-BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
 BuildRequires:  php-composer(composer/ca-bundle)        <  2
 BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
 BuildRequires:  php-composer(composer/semver)           <  2
 BuildRequires:  php-composer(composer/semver)           >= 1.0
+BuildRequires:  php-composer(composer/spdx-licenses)    <  2
+BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
+BuildRequires:  php-composer(composer/xdebug-handler)   >= 1.1
+BuildRequires:  php-composer(composer/xdebug-handler)   <  2
 BuildRequires:  php-composer(seld/jsonlint)             <  2
 BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
 BuildRequires:  php-composer(seld/phar-utils)           <  2
 BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
-BuildRequires:  php-composer(seld/cli-prompt)           <  2
-BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(psr/log)                   <  2
 BuildRequires:  php-composer(psr/log)                   >= 1.0
 %endif
@@ -88,48 +88,47 @@ BuildRequires:  php-composer(phpunit/phpunit)           >= 4.8.35
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
-BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
 BuildRequires:  php-PsrLog          >= 1.0.0-8
 %endif
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
-#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.2",
+#        "composer/xdebug-handler": "^1.1",
+#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+#        "psr/log": "^1.0"
 #        "seld/jsonlint": "~1.4",
+#        "seld/phar-utils": "^1.0",
 #        "symfony/console": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
 #        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
 #        "symfony/process": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-#        "seld/phar-utils": "^1.0",
-#        "seld/cli-prompt": "^1.0",
-#        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
 Requires:       (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
 Requires:       (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
+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)
 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(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
 Requires:       (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
 %else
-Requires:       php-composer(composer/spdx-licenses)    >= 1.2
-Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
 Requires:       php-composer(composer/ca-bundle)        <  2
 Requires:       php-composer(composer/semver)           >= 1.0
 Requires:       php-composer(composer/semver)           <  2
+Requires:       php-composer(composer/spdx-licenses)    >= 1.2
+Requires:       php-composer(composer/spdx-licenses)    <  2
+Requires:       php-composer(composer/xdebug-handler)   >= 1.1
+Requires:       php-composer(composer/xdebug-handler)   <  2
 Requires:       php-composer(seld/jsonlint)             >= 1.4
 Requires:       php-composer(seld/jsonlint)             <  2
 Requires:       php-composer(seld/phar-utils)           >= 1.0
 Requires:       php-composer(seld/phar-utils)           <  2
-Requires:       php-composer(seld/cli-prompt)           >= 1.0
-Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(psr/log)                   >= 1.0
 Requires:       php-composer(psr/log)                   <  2
 %endif
@@ -138,14 +137,15 @@ Requires:       %{symfony_prefix}-finder
 Requires:       %{symfony_prefix}-process
 Requires:       %{symfony_prefix}-filesystem
 # From composer.json, suggest
-#        "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
-#        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages"
-Requires:       php-zip
+#        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+#        "ext-zip": "Enabling the zip extension allows you to unzip archives",
+#        "ext-zlib": "Allow gzip compression of HTTP requests"
 Requires:       php-openssl
+Requires:       php-zip
+Requires:       php-zlib
 # For our autoloader
 Requires:       php-composer(fedora/autoloader)
 Requires:       php-seld-phar-utils >= 1.0.1
-Requires:       php-seld-cli-prompt >= 1.0.0-3
 Requires:       php-PsrLog          >= 1.0.0-8
 # From phpcompatinfo
 Requires:       php-curl
@@ -260,7 +260,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php70 php71 php72 php73; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -285,6 +285,11 @@ exit $ret
 
 
 %changelog
+* Fri Aug 17 2018 Remi Collet <remi@remirepo.net> - 1.7.2-1
+- update to 1.7.2
+- drop dependency on seld/cli-prompt
+- add dependency on composer/xdebug-handler
+
 * Fri May  4 2018 Remi Collet <remi@remirepo.net> - 1.6.5-1
 - update to 1.6.5
 
diff --git a/sources b/sources
index fc7a589..6879ef7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.6.5-b184a92.tgz) = 9aba64c856c6c0679ee2c373d2428cbc07ff791a7c673ad129e6bce36c9b69ab5d60dae8698312d063f79a35fd183d6c80cf1db0a64e06b0cf7c684b6dc5515d
+SHA512 (composer-1.7.2-576aab9.tgz) = 9352fe99c7747a75b2f59a0ed4aa1cdd69c7ef76ff707508bb05ddd9432ca50774bd9eab1471516e2e42f9dd447fa6e035676107c0fc573500a07dfb9d062d49

From a05a2ee8e169a544f436610d157836f9f8e7f26c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 2 Nov 2018 08:46:39 +0100
Subject: [PATCH 101/269] v1.7.3

---
 .gitignore    | 23 +----------------------
 composer.spec |  8 +++++---
 sources       |  2 +-
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed20f1e..f2c4f65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,2 @@
 clog
-/composer-1.3.0-e53f9e5.tar.gz
-/composer-1.3.1-91dbca5.tar.gz
-/composer-1.3.2-e7569ed.tar.gz
-/composer-1.3.3-989d687.tar.gz
-/composer-1.4.0-b19655f.tar.gz
-/composer-1.4.1-7ee2a5e.tar.gz
-/composer-1.4.2-489e09e.tar.gz
-/composer-1.4.3-62c17fd.tar.gz
-/composer-1.5.0-6f3310c.tar.gz
-/composer-1.5.1-d60a1ff.tar.gz
-/composer-1.5.2-c639623.tar.gz
-/composer-1.5.3-de0c4af.tar.gz
-/composer-1.5.4-73aa733.tar.gz
-/composer-1.5.5-aab6229.tar.gz
-/composer-1.5.6-4f7f9c1.tar.gz
-/composer-1.6.0-87f845d.tgz
-/composer-1.6.1-9445e12.tgz
-/composer-1.6.2-db191ab.tgz
-/composer-1.6.3-88a69fd.tgz
-/composer-1.6.4-86ad51e.tgz
-/composer-1.6.5-b184a92.tgz
-/composer-1.7.2-576aab9.tgz
+/composer-*.tgz
diff --git a/composer.spec b/composer.spec
index 98aff26..a33d4d6 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    576aab9b5abb2ed11a1c52353a759363216a4ad2
+%global gh_commit    e965b9aaa8854c3067f1ed2ae45f436572d73eb7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.7.2
+%global upstream_version 1.7.3
 #global upstream_prever  RC
 
 %if 0
@@ -33,7 +33,6 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
-Group:          Development/Libraries
 License:        MIT
 URL:            https://getcomposer.org/
 Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
@@ -285,6 +284,9 @@ exit $ret
 
 
 %changelog
+* Fri Nov  2 2018 Remi Collet <remi@remirepo.net> - 1.7.3-1
+- update to 1.7.3
+
 * Fri Aug 17 2018 Remi Collet <remi@remirepo.net> - 1.7.2-1
 - update to 1.7.2
 - drop dependency on seld/cli-prompt
diff --git a/sources b/sources
index 6879ef7..f17a96f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.7.2-576aab9.tgz) = 9352fe99c7747a75b2f59a0ed4aa1cdd69c7ef76ff707508bb05ddd9432ca50774bd9eab1471516e2e42f9dd447fa6e035676107c0fc573500a07dfb9d062d49
+SHA512 (composer-1.7.3-e965b9a.tgz) = 252280d6b4aee501c11e7fd512ccbef28ea1e2116b7163c184661a7132717647e38beb62c9f8311b7e5e3227c42f9de26d2c1cefc8fce02307987f44130f70ac

From d1eaddbaa693c2d21aa1c27643769ab40e82c7ac Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 2 Nov 2018 08:46:39 +0100
Subject: [PATCH 102/269] v1.7.3

(cherry picked from commit a05a2ee8e169a544f436610d157836f9f8e7f26c)
---
 .gitignore    | 23 +----------------------
 composer.spec |  8 +++++---
 sources       |  2 +-
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed20f1e..f2c4f65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,2 @@
 clog
-/composer-1.3.0-e53f9e5.tar.gz
-/composer-1.3.1-91dbca5.tar.gz
-/composer-1.3.2-e7569ed.tar.gz
-/composer-1.3.3-989d687.tar.gz
-/composer-1.4.0-b19655f.tar.gz
-/composer-1.4.1-7ee2a5e.tar.gz
-/composer-1.4.2-489e09e.tar.gz
-/composer-1.4.3-62c17fd.tar.gz
-/composer-1.5.0-6f3310c.tar.gz
-/composer-1.5.1-d60a1ff.tar.gz
-/composer-1.5.2-c639623.tar.gz
-/composer-1.5.3-de0c4af.tar.gz
-/composer-1.5.4-73aa733.tar.gz
-/composer-1.5.5-aab6229.tar.gz
-/composer-1.5.6-4f7f9c1.tar.gz
-/composer-1.6.0-87f845d.tgz
-/composer-1.6.1-9445e12.tgz
-/composer-1.6.2-db191ab.tgz
-/composer-1.6.3-88a69fd.tgz
-/composer-1.6.4-86ad51e.tgz
-/composer-1.6.5-b184a92.tgz
-/composer-1.7.2-576aab9.tgz
+/composer-*.tgz
diff --git a/composer.spec b/composer.spec
index d25851c..3bc061e 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    576aab9b5abb2ed11a1c52353a759363216a4ad2
+%global gh_commit    e965b9aaa8854c3067f1ed2ae45f436572d73eb7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.7.2
+%global upstream_version 1.7.3
 #global upstream_prever  RC
 
 %if 0
@@ -33,7 +33,6 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
-Group:          Development/Libraries
 License:        MIT
 URL:            https://getcomposer.org/
 Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
@@ -285,6 +284,9 @@ exit $ret
 
 
 %changelog
+* Fri Nov  2 2018 Remi Collet <remi@remirepo.net> - 1.7.3-1
+- update to 1.7.3
+
 * Fri Aug 17 2018 Remi Collet <remi@remirepo.net> - 1.7.2-1
 - update to 1.7.2
 - drop dependency on seld/cli-prompt
diff --git a/sources b/sources
index 6879ef7..f17a96f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.7.2-576aab9.tgz) = 9352fe99c7747a75b2f59a0ed4aa1cdd69c7ef76ff707508bb05ddd9432ca50774bd9eab1471516e2e42f9dd447fa6e035676107c0fc573500a07dfb9d062d49
+SHA512 (composer-1.7.3-e965b9a.tgz) = 252280d6b4aee501c11e7fd512ccbef28ea1e2116b7163c184661a7132717647e38beb62c9f8311b7e5e3227c42f9de26d2c1cefc8fce02307987f44130f70ac

From 9af14ecd276522a0715b6cc957d0403c873d5c88 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 3 Dec 2018 11:24:34 +0100
Subject: [PATCH 103/269] v1.8.0

---
 composer-bootstrap.php |  2 --
 composer.spec          | 12 +++++-------
 sources                |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/composer-bootstrap.php b/composer-bootstrap.php
index 279f1cc..19d75b3 100644
--- a/composer-bootstrap.php
+++ b/composer-bootstrap.php
@@ -1,5 +1,3 @@
 <?php
 require 'Composer/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/');
-require __DIR__.'/Composer/TestCase.php';
-
diff --git a/composer.spec b/composer.spec
index a33d4d6..18a0950 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    e965b9aaa8854c3067f1ed2ae45f436572d73eb7
+%global gh_commit    d8aef3af866b28786ce9b8647e52c42496436669
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.7.3
+%global upstream_version 1.8.0
 #global upstream_prever  RC
 
 %if 0
@@ -246,11 +246,6 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 : Online tests
 rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
-: Known to fail - regression in recent symfony version
-sed -e 's/testDevWarningPrevented/SKIP_testDevWarningPrevented/' \
-    -e 's/testDevWarningPreventedAlias/SKIP_testDevWarningPreventedAlias/' \
-    -i tests/Composer/Test/ApplicationTest.php
-
 : Ensure not used
 rm -rf res
 
@@ -284,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Mon Dec  3 2018 Remi Collet <remi@remirepo.net> - 1.8.0-1
+- update to 1.8.0
+
 * Fri Nov  2 2018 Remi Collet <remi@remirepo.net> - 1.7.3-1
 - update to 1.7.3
 
diff --git a/sources b/sources
index f17a96f..06ea606 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.7.3-e965b9a.tgz) = 252280d6b4aee501c11e7fd512ccbef28ea1e2116b7163c184661a7132717647e38beb62c9f8311b7e5e3227c42f9de26d2c1cefc8fce02307987f44130f70ac
+SHA512 (composer-1.8.0-d8aef3a.tgz) = f7a2c333e014e43c4ad9c5239186c2c8049a5bdd14baf4dc03c8f27a4ef9ba012e2a43565e32e0b7e85a285cfe4671356283e4c38d358686f784b01cc0470745

From d802b9f007eb1aab134f852174d3a09f7441d7ec Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 3 Dec 2018 11:24:34 +0100
Subject: [PATCH 104/269] v1.8.0

(cherry picked from commit 9af14ecd276522a0715b6cc957d0403c873d5c88)
---
 composer-bootstrap.php |  2 --
 composer.spec          | 12 +++++-------
 sources                |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/composer-bootstrap.php b/composer-bootstrap.php
index 279f1cc..19d75b3 100644
--- a/composer-bootstrap.php
+++ b/composer-bootstrap.php
@@ -1,5 +1,3 @@
 <?php
 require 'Composer/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/');
-require __DIR__.'/Composer/TestCase.php';
-
diff --git a/composer.spec b/composer.spec
index 3bc061e..aa06ddf 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    e965b9aaa8854c3067f1ed2ae45f436572d73eb7
+%global gh_commit    d8aef3af866b28786ce9b8647e52c42496436669
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.7.3
+%global upstream_version 1.8.0
 #global upstream_prever  RC
 
 %if 0
@@ -246,11 +246,6 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 : Online tests
 rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
-: Known to fail - regression in recent symfony version
-sed -e 's/testDevWarningPrevented/SKIP_testDevWarningPrevented/' \
-    -e 's/testDevWarningPreventedAlias/SKIP_testDevWarningPreventedAlias/' \
-    -i tests/Composer/Test/ApplicationTest.php
-
 : Ensure not used
 rm -rf res
 
@@ -284,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Mon Dec  3 2018 Remi Collet <remi@remirepo.net> - 1.8.0-1
+- update to 1.8.0
+
 * Fri Nov  2 2018 Remi Collet <remi@remirepo.net> - 1.7.3-1
 - update to 1.7.3
 
diff --git a/sources b/sources
index f17a96f..06ea606 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.7.3-e965b9a.tgz) = 252280d6b4aee501c11e7fd512ccbef28ea1e2116b7163c184661a7132717647e38beb62c9f8311b7e5e3227c42f9de26d2c1cefc8fce02307987f44130f70ac
+SHA512 (composer-1.8.0-d8aef3a.tgz) = f7a2c333e014e43c4ad9c5239186c2c8049a5bdd14baf4dc03c8f27a4ef9ba012e2a43565e32e0b7e85a285cfe4671356283e4c38d358686f784b01cc0470745

From 1d60fc1215b5a8935ccd8f3b53e35cefab78b3e5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Jan 2019 10:33:54 +0100
Subject: [PATCH 105/269] v1.8.3

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index 18a0950..002841a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2018 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    d8aef3af866b28786ce9b8647e52c42496436669
+%global gh_commit    a6a3b44581398b7135c7baa0557b7c5b10808b47
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.0
+%global upstream_version 1.8.3
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Wed Jan 30 2019 Remi Collet <remi@remirepo.net> - 1.8.3-1
+- update to 1.8.3
+
 * Mon Dec  3 2018 Remi Collet <remi@remirepo.net> - 1.8.0-1
 - update to 1.8.0
 
diff --git a/sources b/sources
index 06ea606..108a970 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.8.0-d8aef3a.tgz) = f7a2c333e014e43c4ad9c5239186c2c8049a5bdd14baf4dc03c8f27a4ef9ba012e2a43565e32e0b7e85a285cfe4671356283e4c38d358686f784b01cc0470745
+SHA512 (composer-1.8.3-a6a3b44.tgz) = c394d16cd24bfb98aa71b93596341d79cbd5ea2cb662332eef1fd2765f0306ba17e5ffe3144ab4c8f3c0ed7b6fdc0eff57d38b70883391ee8a45cb8c1b8cfdf1

From 8649f9fbeb9bca0d400f0f314cbe8d3c13a5ed27 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Jan 2019 10:33:54 +0100
Subject: [PATCH 106/269] v1.8.3

(cherry picked from commit 1d60fc1215b5a8935ccd8f3b53e35cefab78b3e5)
---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index aa06ddf..5325709 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2018 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    d8aef3af866b28786ce9b8647e52c42496436669
+%global gh_commit    a6a3b44581398b7135c7baa0557b7c5b10808b47
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.0
+%global upstream_version 1.8.3
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Wed Jan 30 2019 Remi Collet <remi@remirepo.net> - 1.8.3-1
+- update to 1.8.3
+
 * Mon Dec  3 2018 Remi Collet <remi@remirepo.net> - 1.8.0-1
 - update to 1.8.0
 
diff --git a/sources b/sources
index 06ea606..108a970 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.8.0-d8aef3a.tgz) = f7a2c333e014e43c4ad9c5239186c2c8049a5bdd14baf4dc03c8f27a4ef9ba012e2a43565e32e0b7e85a285cfe4671356283e4c38d358686f784b01cc0470745
+SHA512 (composer-1.8.3-a6a3b44.tgz) = c394d16cd24bfb98aa71b93596341d79cbd5ea2cb662332eef1fd2765f0306ba17e5ffe3144ab4c8f3c0ed7b6fdc0eff57d38b70883391ee8a45cb8c1b8cfdf1

From d5da83bd6a31499e18d04e1f472e5e57c430d683 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 16:08:28 +0000
Subject: [PATCH 107/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 002841a..ccace79 100644
--- a/composer.spec
+++ b/composer.spec
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Wed Jan 30 2019 Remi Collet <remi@remirepo.net> - 1.8.3-1
 - update to 1.8.3
 

From 7071d705f10a73212844e3fe53026ee1766b6562 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 11 Feb 2019 14:35:27 +0100
Subject: [PATCH 108/269] v1.8.4

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index ccace79..c04afcf 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    a6a3b44581398b7135c7baa0557b7c5b10808b47
+%global gh_commit    bc364c2480c17941e2135cfc568fa41794392534
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.3
+%global upstream_version 1.8.4
 #global upstream_prever  RC
 
 %if 0
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Mon Feb 11 2019 Remi Collet <remi@remirepo.net> - 1.8.4-1
+- update to 1.8.4
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 108a970..3f49f62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.8.3-a6a3b44.tgz) = c394d16cd24bfb98aa71b93596341d79cbd5ea2cb662332eef1fd2765f0306ba17e5ffe3144ab4c8f3c0ed7b6fdc0eff57d38b70883391ee8a45cb8c1b8cfdf1
+SHA512 (composer-1.8.4-bc364c2.tgz) = 77c75f9ba6d05ce055e4f43266efb0bce33e20738ac2c13d453ba83d9cae504e64dc0c474c7323613564b085a51ae10e6fc1d2ce03dcd07d352d2a6734708c46

From 45cf6da7d819f09946e5d25a917eacfba638f4c0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 11 Feb 2019 14:35:27 +0100
Subject: [PATCH 109/269] v1.8.4

(cherry picked from commit 7071d705f10a73212844e3fe53026ee1766b6562)
(cherry picked from commit 2f6de12ba0cd6b66d066e5058cd18246c4d8e182)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 5325709..07c4303 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    a6a3b44581398b7135c7baa0557b7c5b10808b47
+%global gh_commit    bc364c2480c17941e2135cfc568fa41794392534
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.3
+%global upstream_version 1.8.4
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Mon Feb 11 2019 Remi Collet <remi@remirepo.net> - 1.8.4-1
+- update to 1.8.4
+
 * Wed Jan 30 2019 Remi Collet <remi@remirepo.net> - 1.8.3-1
 - update to 1.8.3
 
diff --git a/sources b/sources
index 108a970..3f49f62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.8.3-a6a3b44.tgz) = c394d16cd24bfb98aa71b93596341d79cbd5ea2cb662332eef1fd2765f0306ba17e5ffe3144ab4c8f3c0ed7b6fdc0eff57d38b70883391ee8a45cb8c1b8cfdf1
+SHA512 (composer-1.8.4-bc364c2.tgz) = 77c75f9ba6d05ce055e4f43266efb0bce33e20738ac2c13d453ba83d9cae504e64dc0c474c7323613564b085a51ae10e6fc1d2ce03dcd07d352d2a6734708c46

From 3cd393463e753395a01c3b4bae58e8a16106faa3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 10 Apr 2019 08:38:36 +0200
Subject: [PATCH 110/269] v1.8.5

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index c04afcf..617d212 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    bc364c2480c17941e2135cfc568fa41794392534
+%global gh_commit    949b116f9e7d98d8d276594fed74b580d125c0e6
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.4
+%global upstream_version 1.8.5
 #global upstream_prever  RC
 
 %if 0
@@ -254,7 +254,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php70 php71 php72 php73; do
+for cmd in php php71 php72 php73; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Wed Apr 10 2019 Remi Collet <remi@remirepo.net> - 1.8.5-1
+- update to 1.8.5
+
 * Mon Feb 11 2019 Remi Collet <remi@remirepo.net> - 1.8.4-1
 - update to 1.8.4
 
diff --git a/sources b/sources
index 3f49f62..9e9ddf3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.8.4-bc364c2.tgz) = 77c75f9ba6d05ce055e4f43266efb0bce33e20738ac2c13d453ba83d9cae504e64dc0c474c7323613564b085a51ae10e6fc1d2ce03dcd07d352d2a6734708c46
+SHA512 (composer-1.8.5-949b116.tgz) = a7cbf9fd51ec836458910929dc82e4f1e922d152531337773c014403628e762e83fb761f9a9673e254f60d29538b3bec3dea77ff3bbc0121b5dc5ff4b4cd394c

From 341dc357147ad4187256cca065e9fba3497804e3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 10 Apr 2019 08:38:36 +0200
Subject: [PATCH 111/269] v1.8.5

(cherry picked from commit 3cd393463e753395a01c3b4bae58e8a16106faa3)
---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index 07c4303..e6057bb 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    bc364c2480c17941e2135cfc568fa41794392534
+%global gh_commit    949b116f9e7d98d8d276594fed74b580d125c0e6
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.4
+%global upstream_version 1.8.5
 #global upstream_prever  RC
 
 %if 0
@@ -254,7 +254,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php70 php71 php72 php73; do
+for cmd in php php71 php72 php73; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Wed Apr 10 2019 Remi Collet <remi@remirepo.net> - 1.8.5-1
+- update to 1.8.5
+
 * Mon Feb 11 2019 Remi Collet <remi@remirepo.net> - 1.8.4-1
 - update to 1.8.4
 
diff --git a/sources b/sources
index 3f49f62..9e9ddf3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.8.4-bc364c2.tgz) = 77c75f9ba6d05ce055e4f43266efb0bce33e20738ac2c13d453ba83d9cae504e64dc0c474c7323613564b085a51ae10e6fc1d2ce03dcd07d352d2a6734708c46
+SHA512 (composer-1.8.5-949b116.tgz) = a7cbf9fd51ec836458910929dc82e4f1e922d152531337773c014403628e762e83fb761f9a9673e254f60d29538b3bec3dea77ff3bbc0121b5dc5ff4b4cd394c

From 3f14c1f126ff6e35d723f536be660e1740e0e45f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 12 Jun 2019 10:31:25 +0200
Subject: [PATCH 112/269] v1.8.6

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index 617d212..03d5542 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    949b116f9e7d98d8d276594fed74b580d125c0e6
+%global gh_commit    19b5f66a0e233eb944f134df34091fe1c5dfcc11
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.5
+%global upstream_version 1.8.6
 #global upstream_prever  RC
 
 %if 0
@@ -254,7 +254,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php71 php72 php73; do
+for cmd in php php71 php72 php73 php74; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Tue Jun 11 2019 Remi Collet <remi@remirepo.net> - 1.8.6-1
+- update to 1.8.6
+
 * Wed Apr 10 2019 Remi Collet <remi@remirepo.net> - 1.8.5-1
 - update to 1.8.5
 
diff --git a/sources b/sources
index 9e9ddf3..82a26bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.8.5-949b116.tgz) = a7cbf9fd51ec836458910929dc82e4f1e922d152531337773c014403628e762e83fb761f9a9673e254f60d29538b3bec3dea77ff3bbc0121b5dc5ff4b4cd394c
+SHA512 (composer-1.8.6-19b5f66.tgz) = 12158c392f8987567d2ed902d52671b37a910498918cf76db30e6eb1110cf6fa3eac27279d5054dbfc92d83fe4a36f69211331ad580e7c3156ded71d68429f7b

From f04dfad582c763e8c12a7d4defd9c149110e9741 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 12 Jun 2019 10:31:25 +0200
Subject: [PATCH 113/269] v1.8.6

(cherry picked from commit 3f14c1f126ff6e35d723f536be660e1740e0e45f)
---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index e6057bb..2c35dac 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    949b116f9e7d98d8d276594fed74b580d125c0e6
+%global gh_commit    19b5f66a0e233eb944f134df34091fe1c5dfcc11
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.5
+%global upstream_version 1.8.6
 #global upstream_prever  RC
 
 %if 0
@@ -254,7 +254,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php71 php72 php73; do
+for cmd in php php71 php72 php73 php74; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Tue Jun 11 2019 Remi Collet <remi@remirepo.net> - 1.8.6-1
+- update to 1.8.6
+
 * Wed Apr 10 2019 Remi Collet <remi@remirepo.net> - 1.8.5-1
 - update to 1.8.5
 
diff --git a/sources b/sources
index 9e9ddf3..82a26bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.8.5-949b116.tgz) = a7cbf9fd51ec836458910929dc82e4f1e922d152531337773c014403628e762e83fb761f9a9673e254f60d29538b3bec3dea77ff3bbc0121b5dc5ff4b4cd394c
+SHA512 (composer-1.8.6-19b5f66.tgz) = 12158c392f8987567d2ed902d52671b37a910498918cf76db30e6eb1110cf6fa3eac27279d5054dbfc92d83fe4a36f69211331ad580e7c3156ded71d68429f7b

From bbc689ce957af173f719b436f667a4907663a99a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 20:50:58 +0000
Subject: [PATCH 114/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 03d5542..a89b6fd 100644
--- a/composer.spec
+++ b/composer.spec
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue Jun 11 2019 Remi Collet <remi@remirepo.net> - 1.8.6-1
 - update to 1.8.6
 

From 609e0792cab485f369f7c369147ee159e1efa8e6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 19 Aug 2019 15:14:57 +0200
Subject: [PATCH 115/269] v1.9.0

---
 composer-rpm.patch | 43 ++++++++++++++++++++++++++-----------------
 composer.spec      |  9 ++++++---
 sources            |  2 +-
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 3ed61f4..b6bccfb 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,7 +1,7 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2018-07-26 09:44:36.765795459 +0200
-+++ ./bin/composer	2018-07-26 09:45:14.199012215 +0200
-@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') {
+--- ./bin/composer.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./bin/composer	2019-08-03 10:30:42.907772543 +0200
+@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
  setlocale(LC_ALL, 'C');
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-07-26 09:44:36.765795459 +0200
-@@ -305,7 +305,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2019-08-03 10:30:42.908772550 +0200
+@@ -306,7 +306,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Compiler.php	2018-07-26 09:44:36.765795459 +0200
+--- ./src/Composer/Compiler.php.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./src/Composer/Compiler.php	2019-08-03 10:30:42.908772550 +0200
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,20 +35,29 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2018-07-26 09:44:36.765795459 +0200
-@@ -156,7 +156,7 @@ class JsonFile
-             self::validateSyntax($content, $this->path);
+--- ./src/Composer/Json/JsonFile.php.rpm	2019-08-03 10:30:42.908772550 +0200
++++ ./src/Composer/Json/JsonFile.php	2019-08-03 10:32:48.919630077 +0200
+@@ -34,7 +34,7 @@ class JsonFile
+     const JSON_PRETTY_PRINT = 128;
+     const JSON_UNESCAPED_UNICODE = 256;
+ 
+-    const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json';
++    const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
+ 
+     private $path;
+     private $rfs;
+@@ -160,7 +160,7 @@ class JsonFile
          }
  
--        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
-+        $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
+         if (null === $schemaFile) {
+-            $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH;
++            $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH;
+         }
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
-         if (false === strpos($schemaFile, '://')) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-07-26 09:44:36.765795459 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2019-08-03 10:30:42.908772550 +0200
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
diff --git a/composer.spec b/composer.spec
index a89b6fd..6d677a1 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    19b5f66a0e233eb944f134df34091fe1c5dfcc11
+%global gh_commit    314aa57fdcfc942065996f59fb73a8b3f74f3fa5
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.6
+%global upstream_version 1.9.0
 #global upstream_prever  RC
 
 %if 0
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Sat Aug  3 2019 Remi Collet <remi@remirepo.net> - 1.9.0-1
+- update to 1.9.0
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 82a26bc..04152ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.8.6-19b5f66.tgz) = 12158c392f8987567d2ed902d52671b37a910498918cf76db30e6eb1110cf6fa3eac27279d5054dbfc92d83fe4a36f69211331ad580e7c3156ded71d68429f7b
+SHA512 (composer-1.9.0-314aa57.tgz) = 5bd2f3e9685a103f830ce0fb3818b0ca2c6c8456e15ebd6683c3c04e7b5a8ba41466c6a639233e549dc9198bb45bb4f2079773409505140bf15d99635141b099

From 6f118fa8e6a069e6bca95c0fdf68d030628d800b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 19 Aug 2019 15:14:57 +0200
Subject: [PATCH 116/269] v1.9.0

(cherry picked from commit 609e0792cab485f369f7c369147ee159e1efa8e6)
(cherry picked from commit 65fe2493c7ca7f8c90caac08e250f606d40e40e1)
---
 composer-rpm.patch | 43 ++++++++++++++++++++++++++-----------------
 composer.spec      |  7 +++++--
 sources            |  2 +-
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 3ed61f4..b6bccfb 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,7 +1,7 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2018-07-26 09:44:36.765795459 +0200
-+++ ./bin/composer	2018-07-26 09:45:14.199012215 +0200
-@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') {
+--- ./bin/composer.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./bin/composer	2019-08-03 10:30:42.907772543 +0200
+@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
  setlocale(LC_ALL, 'C');
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-07-26 09:44:36.765795459 +0200
-@@ -305,7 +305,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2019-08-03 10:30:42.908772550 +0200
+@@ -306,7 +306,7 @@ EOF;
          file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Compiler.php	2018-07-26 09:44:36.765795459 +0200
+--- ./src/Composer/Compiler.php.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./src/Composer/Compiler.php	2019-08-03 10:30:42.908772550 +0200
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,20 +35,29 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2018-07-26 09:44:36.765795459 +0200
-@@ -156,7 +156,7 @@ class JsonFile
-             self::validateSyntax($content, $this->path);
+--- ./src/Composer/Json/JsonFile.php.rpm	2019-08-03 10:30:42.908772550 +0200
++++ ./src/Composer/Json/JsonFile.php	2019-08-03 10:32:48.919630077 +0200
+@@ -34,7 +34,7 @@ class JsonFile
+     const JSON_PRETTY_PRINT = 128;
+     const JSON_UNESCAPED_UNICODE = 256;
+ 
+-    const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json';
++    const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
+ 
+     private $path;
+     private $rfs;
+@@ -160,7 +160,7 @@ class JsonFile
          }
  
--        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
-+        $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
+         if (null === $schemaFile) {
+-            $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH;
++            $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH;
+         }
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
-         if (false === strpos($schemaFile, '://')) {
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-07-26 09:36:57.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-07-26 09:44:36.765795459 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2019-08-03 10:30:10.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2019-08-03 10:30:42.908772550 +0200
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
diff --git a/composer.spec b/composer.spec
index 2c35dac..e459e0a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    19b5f66a0e233eb944f134df34091fe1c5dfcc11
+%global gh_commit    314aa57fdcfc942065996f59fb73a8b3f74f3fa5
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.8.6
+%global upstream_version 1.9.0
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Sat Aug  3 2019 Remi Collet <remi@remirepo.net> - 1.9.0-1
+- update to 1.9.0
+
 * Tue Jun 11 2019 Remi Collet <remi@remirepo.net> - 1.8.6-1
 - update to 1.8.6
 
diff --git a/sources b/sources
index 82a26bc..04152ee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.8.6-19b5f66.tgz) = 12158c392f8987567d2ed902d52671b37a910498918cf76db30e6eb1110cf6fa3eac27279d5054dbfc92d83fe4a36f69211331ad580e7c3156ded71d68429f7b
+SHA512 (composer-1.9.0-314aa57.tgz) = 5bd2f3e9685a103f830ce0fb3818b0ca2c6c8456e15ebd6683c3c04e7b5a8ba41466c6a639233e549dc9198bb45bb4f2079773409505140bf15d99635141b099

From 2e102b861fec2c3b18f3d124a7b5f9181a6a98a9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 9 Oct 2019 08:32:55 +0200
Subject: [PATCH 117/269] add upstream patch for PHP 7.4

---
 ...01b471c0deecf95647b7b48e7712623208da.patch | 27 +++++++++++++++++++
 composer.spec                                 |  7 ++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 550c01b471c0deecf95647b7b48e7712623208da.patch

diff --git a/550c01b471c0deecf95647b7b48e7712623208da.patch b/550c01b471c0deecf95647b7b48e7712623208da.patch
new file mode 100644
index 0000000..f5dd971
--- /dev/null
+++ b/550c01b471c0deecf95647b7b48e7712623208da.patch
@@ -0,0 +1,27 @@
+From 550c01b471c0deecf95647b7b48e7712623208da Mon Sep 17 00:00:00 2001
+From: rbairwell <rbairwell@users.noreply.github.com>
+Date: Tue, 27 Aug 2019 20:53:57 +0100
+Subject: [PATCH] Fixes a problem with path based repositories on PHP7.4 where
+ an attempt is made to access null as an array
+
+---
+ src/Composer/Repository/PathRepository.php | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/Composer/Repository/PathRepository.php b/src/Composer/Repository/PathRepository.php
+index 61ebc8d8cd3c..20dcbcd6faa0 100644
+--- a/src/Composer/Repository/PathRepository.php
++++ b/src/Composer/Repository/PathRepository.php
+@@ -155,7 +155,11 @@ protected function initialize()
+ 
+             if (!isset($package['version'])) {
+                 $versionData = $this->versionGuesser->guessVersion($package, $path);
+-                $package['version'] = $versionData['pretty_version'] ?: 'dev-master';
++                if (is_array($versionData)) {
++                    $package['version'] = $versionData['pretty_version'] ?: 'dev-master';
++                } else {
++                    $package['version'] = 'dev-master';
++                }
+             }
+ 
+             $output = '';
diff --git a/composer.spec b/composer.spec
index 6d677a1..3df6e48 100644
--- a/composer.spec
+++ b/composer.spec
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -46,6 +46,7 @@ Source5:        makesrc.sh
 
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
+Patch1:         https://github.com/composer/composer/commit/550c01b471c0deecf95647b7b48e7712623208da.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
@@ -184,6 +185,7 @@ Documentation: https://getcomposer.org/doc/
 
 %patch0 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
+%patch1 -p1
 
 if grep -r '\.\./res'; then
 	: Patch need to fixed
@@ -279,6 +281,9 @@ exit $ret
 
 
 %changelog
+* Wed Oct  9 2019 Remi Collet <remi@remirepo.net> - 1.9.0-2
+- add upstream patch for PHP 7.4
+
 * Sat Aug  3 2019 Remi Collet <remi@remirepo.net> - 1.9.0-1
 - update to 1.9.0
 

From 2904e1b36f7785e2735c6db05409416e01ad26a9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 4 Nov 2019 11:20:04 +0100
Subject: [PATCH 118/269] v1.9.1

---
 ...01b471c0deecf95647b7b48e7712623208da.patch | 27 -------------------
 composer.spec                                 | 11 ++++----
 sources                                       |  2 +-
 3 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 550c01b471c0deecf95647b7b48e7712623208da.patch

diff --git a/550c01b471c0deecf95647b7b48e7712623208da.patch b/550c01b471c0deecf95647b7b48e7712623208da.patch
deleted file mode 100644
index f5dd971..0000000
--- a/550c01b471c0deecf95647b7b48e7712623208da.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 550c01b471c0deecf95647b7b48e7712623208da Mon Sep 17 00:00:00 2001
-From: rbairwell <rbairwell@users.noreply.github.com>
-Date: Tue, 27 Aug 2019 20:53:57 +0100
-Subject: [PATCH] Fixes a problem with path based repositories on PHP7.4 where
- an attempt is made to access null as an array
-
----
- src/Composer/Repository/PathRepository.php | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/Composer/Repository/PathRepository.php b/src/Composer/Repository/PathRepository.php
-index 61ebc8d8cd3c..20dcbcd6faa0 100644
---- a/src/Composer/Repository/PathRepository.php
-+++ b/src/Composer/Repository/PathRepository.php
-@@ -155,7 +155,11 @@ protected function initialize()
- 
-             if (!isset($package['version'])) {
-                 $versionData = $this->versionGuesser->guessVersion($package, $path);
--                $package['version'] = $versionData['pretty_version'] ?: 'dev-master';
-+                if (is_array($versionData)) {
-+                    $package['version'] = $versionData['pretty_version'] ?: 'dev-master';
-+                } else {
-+                    $package['version'] = 'dev-master';
-+                }
-             }
- 
-             $output = '';
diff --git a/composer.spec b/composer.spec
index 3df6e48..c7967ce 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    314aa57fdcfc942065996f59fb73a8b3f74f3fa5
+%global gh_commit    bb01f2180df87ce7992b8331a68904f80439dd2f
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.9.0
+%global upstream_version 1.9.1
 #global upstream_prever  RC
 
 %if 0
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -46,7 +46,6 @@ Source5:        makesrc.sh
 
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
-Patch1:         https://github.com/composer/composer/commit/550c01b471c0deecf95647b7b48e7712623208da.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
@@ -185,7 +184,6 @@ Documentation: https://getcomposer.org/doc/
 
 %patch0 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
-%patch1 -p1
 
 if grep -r '\.\./res'; then
 	: Patch need to fixed
@@ -281,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Sat Nov  2 2019 Remi Collet <remi@remirepo.net> - 1.9.1-1
+- update to 1.9.1
+
 * Wed Oct  9 2019 Remi Collet <remi@remirepo.net> - 1.9.0-2
 - add upstream patch for PHP 7.4
 
diff --git a/sources b/sources
index 04152ee..5d914d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.9.0-314aa57.tgz) = 5bd2f3e9685a103f830ce0fb3818b0ca2c6c8456e15ebd6683c3c04e7b5a8ba41466c6a639233e549dc9198bb45bb4f2079773409505140bf15d99635141b099
+SHA512 (composer-1.9.1-bb01f21.tgz) = aaec165a30a8ff93fd81b9a4dd8318d077166dba55dab9753203f72689dbc38e0f7aa966d1d190a3faf92d41417a2e402ea2cb664a463cd6c48708e0aa3d34d2

From 241caae1165ef08ded7d88ba1ea7a2a670c092ba Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 4 Nov 2019 11:20:04 +0100
Subject: [PATCH 119/269] v1.9.1

(cherry picked from commit 2904e1b36f7785e2735c6db05409416e01ad26a9)
(cherry picked from commit 2b0cf67b934f5a3961b52a82aa478c8dce7fa812)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index e459e0a..0035dc4 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    314aa57fdcfc942065996f59fb73a8b3f74f3fa5
+%global gh_commit    bb01f2180df87ce7992b8331a68904f80439dd2f
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.9.0
+%global upstream_version 1.9.1
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Sat Nov  2 2019 Remi Collet <remi@remirepo.net> - 1.9.1-1
+- update to 1.9.1
+
 * Sat Aug  3 2019 Remi Collet <remi@remirepo.net> - 1.9.0-1
 - update to 1.9.0
 
diff --git a/sources b/sources
index 04152ee..5d914d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.9.0-314aa57.tgz) = 5bd2f3e9685a103f830ce0fb3818b0ca2c6c8456e15ebd6683c3c04e7b5a8ba41466c6a639233e549dc9198bb45bb4f2079773409505140bf15d99635141b099
+SHA512 (composer-1.9.1-bb01f21.tgz) = aaec165a30a8ff93fd81b9a4dd8318d077166dba55dab9753203f72689dbc38e0f7aa966d1d190a3faf92d41417a2e402ea2cb664a463cd6c48708e0aa3d34d2

From d9070150c6361815de245cae2b9651a585a98bf7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 15 Jan 2020 08:00:39 +0100
Subject: [PATCH 120/269] v1.9.2

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index c7967ce..0feb58f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2019 Remi Collet
+# Copyright (c) 2015-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    bb01f2180df87ce7992b8331a68904f80439dd2f
+%global gh_commit    7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.9.1
+%global upstream_version 1.9.2
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 1.9.2-1
+- update to 1.9.2
+
 * Sat Nov  2 2019 Remi Collet <remi@remirepo.net> - 1.9.1-1
 - update to 1.9.1
 
diff --git a/sources b/sources
index 5d914d0..1d5d37e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.9.1-bb01f21.tgz) = aaec165a30a8ff93fd81b9a4dd8318d077166dba55dab9753203f72689dbc38e0f7aa966d1d190a3faf92d41417a2e402ea2cb664a463cd6c48708e0aa3d34d2
+SHA512 (composer-1.9.2-7a04aa0.tgz) = f121a9b89330f86c42a58ac557a93d3001f98af5c7b3a5b459dadb63a47602206c32662f5889f7f131fb71bd0da6d8ee143ffcea58541c67b078f4b0a2f69f27

From 29cb219c0fe1bf0b43039d7e5600fc0a5ab20308 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 15 Jan 2020 08:00:39 +0100
Subject: [PATCH 121/269] v1.9.2

(cherry picked from commit d9070150c6361815de245cae2b9651a585a98bf7)
---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index 0035dc4..6dc2119 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2019 Remi Collet
+# Copyright (c) 2015-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    bb01f2180df87ce7992b8331a68904f80439dd2f
+%global gh_commit    7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.9.1
+%global upstream_version 1.9.2
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 1.9.2-1
+- update to 1.9.2
+
 * Sat Nov  2 2019 Remi Collet <remi@remirepo.net> - 1.9.1-1
 - update to 1.9.1
 
diff --git a/sources b/sources
index 5d914d0..1d5d37e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.9.1-bb01f21.tgz) = aaec165a30a8ff93fd81b9a4dd8318d077166dba55dab9753203f72689dbc38e0f7aa966d1d190a3faf92d41417a2e402ea2cb664a463cd6c48708e0aa3d34d2
+SHA512 (composer-1.9.2-7a04aa0.tgz) = f121a9b89330f86c42a58ac557a93d3001f98af5c7b3a5b459dadb63a47602206c32662f5889f7f131fb71bd0da6d8ee143ffcea58541c67b078f4b0a2f69f27

From b006a97e6d9d1727f3bcc299ab932c3664870969 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 14:39:23 +0000
Subject: [PATCH 122/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 0feb58f..167ae5f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 1.9.2-1
 - update to 1.9.2
 

From 2a788a0ea80275708ef469a1ced68b578b9a911f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 4 Feb 2020 14:37:13 +0100
Subject: [PATCH 123/269] v1.9.3

---
 composer.spec | 11 +++++++----
 sources       |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer.spec b/composer.spec
index 167ae5f..ba2d18d 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb
+%global gh_commit    1291a16ce3f48bfdeca39d64fca4875098af4d7b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.9.2
+%global upstream_version 1.9.3
 #global upstream_prever  RC
 
 %if 0
@@ -30,7 +30,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -254,7 +254,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php72 php73 php74; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Tue Feb  4 2020 Remi Collet <remi@remirepo.net> - 1.9.3-1
+- update to 1.9.3
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 1d5d37e..b93fc6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.9.2-7a04aa0.tgz) = f121a9b89330f86c42a58ac557a93d3001f98af5c7b3a5b459dadb63a47602206c32662f5889f7f131fb71bd0da6d8ee143ffcea58541c67b078f4b0a2f69f27
+SHA512 (composer-1.9.3-1291a16.tgz) = e65305862550cea87d693edb0a16c7957a40cdcd466506b60a8faa21f689fdd3161509217cb1e71c77873b6af4bd6f8470ae805156689517885f9f4792ef9e6d

From b3a8cffcef3fe48aa088a1c9628ab606112da139 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 4 Feb 2020 14:37:13 +0100
Subject: [PATCH 124/269] v1.9.3

(cherry picked from commit 2a788a0ea80275708ef469a1ced68b578b9a911f)
(cherry picked from commit 7bc938fec1810dae76f8376f295efc24f67b2182)
---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index 6dc2119..4854538 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb
+%global gh_commit    1291a16ce3f48bfdeca39d64fca4875098af4d7b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.9.2
+%global upstream_version 1.9.3
 #global upstream_prever  RC
 
 %if 0
@@ -254,7 +254,7 @@ export BUILDROOT=%{buildroot}
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php72 php73 php74; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
       --filter '^((?!(testIntegration)).)*$' \
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Tue Feb  4 2020 Remi Collet <remi@remirepo.net> - 1.9.3-1
+- update to 1.9.3
+
 * Tue Jan 14 2020 Remi Collet <remi@remirepo.net> - 1.9.2-1
 - update to 1.9.2
 
diff --git a/sources b/sources
index 1d5d37e..b93fc6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.9.2-7a04aa0.tgz) = f121a9b89330f86c42a58ac557a93d3001f98af5c7b3a5b459dadb63a47602206c32662f5889f7f131fb71bd0da6d8ee143ffcea58541c67b078f4b0a2f69f27
+SHA512 (composer-1.9.3-1291a16.tgz) = e65305862550cea87d693edb0a16c7957a40cdcd466506b60a8faa21f689fdd3161509217cb1e71c77873b6af4bd6f8470ae805156689517885f9f4792ef9e6d

From afe24c28a5770c8d708105884e8b771acc0a5c48 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 11 Mar 2020 09:09:51 +0100
Subject: [PATCH 125/269] v1.10.0

---
 composer-rpm.patch | 26 +++++++++++++-------------
 composer.spec      | 21 ++++++++++++---------
 sources            |  2 +-
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index b6bccfb..ec7ff9b 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./bin/composer	2019-08-03 10:30:42.907772543 +0200
+--- ./bin/composer.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./bin/composer	2020-02-14 15:37:43.336528140 +0100
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
@@ -11,10 +11,10 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2019-08-03 10:30:42.908772550 +0200
-@@ -306,7 +306,7 @@ EOF;
-         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2020-02-14 15:37:43.336528140 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2020-02-14 15:38:56.710201606 +0100
+@@ -305,7 +305,7 @@ EOF;
+         $this->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
 -        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./src/Composer/Compiler.php	2019-08-03 10:30:42.908772550 +0200
+--- ./src/Composer/Compiler.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./src/Composer/Compiler.php	2020-02-14 15:37:43.336528140 +0100
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2019-08-03 10:30:42.908772550 +0200
-+++ ./src/Composer/Json/JsonFile.php	2019-08-03 10:32:48.919630077 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2020-02-14 15:37:43.336528140 +0100
 @@ -34,7 +34,7 @@ class JsonFile
      const JSON_PRETTY_PRINT = 128;
      const JSON_UNESCAPED_UNICODE = 256;
@@ -46,7 +46,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      private $path;
      private $rfs;
-@@ -160,7 +160,7 @@ class JsonFile
+@@ -173,7 +173,7 @@ class JsonFile
          }
  
          if (null === $schemaFile) {
@@ -56,8 +56,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2019-08-03 10:30:42.908772550 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2020-02-14 15:37:43.336528140 +0100
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
diff --git a/composer.spec b/composer.spec
index ba2d18d..a30fcca 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    1291a16ce3f48bfdeca39d64fca4875098af4d7b
+%global gh_commit    472c917b2a083ec7d2fa25c55fd099d1300e2515
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.9.3
+%global upstream_version 1.10.0
 #global upstream_prever  RC
 
 %if 0
@@ -81,9 +81,9 @@ BuildRequires:  %{symfony_prefix}-filesystem
 BuildRequires:  %{symfony_prefix}-process
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^4.8.35 || ^5.7",
-#        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
-BuildRequires:  php-composer(phpunit/phpunit)           >= 4.8.35
+#        "symfony/phpunit-bridge": "^3.4",
+#        "phpspec/prophecy": "^1.10"
+BuildRequires:  phpunit
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
@@ -100,10 +100,10 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "psr/log": "^1.0"
 #        "seld/jsonlint": "~1.4",
 #        "seld/phar-utils": "^1.0",
-#        "symfony/console": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/process": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+#        "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+#        "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0",
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Wed Mar 11 2020 Remi Collet <remi@remirepo.net> - 1.10.0-1
+- update to 1.10.0
+
 * Tue Feb  4 2020 Remi Collet <remi@remirepo.net> - 1.9.3-1
 - update to 1.9.3
 
diff --git a/sources b/sources
index b93fc6f..78f485b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.9.3-1291a16.tgz) = e65305862550cea87d693edb0a16c7957a40cdcd466506b60a8faa21f689fdd3161509217cb1e71c77873b6af4bd6f8470ae805156689517885f9f4792ef9e6d
+SHA512 (composer-1.10.0-472c917.tgz) = 69a1481c273e76034dd1ca09dc1c9ee7c48bf298c58c720360cc148255e2a2c840abf9e49d01747144645572c7348283046a9bea64a2f6a113c80429e00a1773

From 3c4c416c30507e8307947b0031660952684bd122 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 11 Mar 2020 09:09:51 +0100
Subject: [PATCH 126/269] v1.10.0

(cherry picked from commit afe24c28a5770c8d708105884e8b771acc0a5c48)
---
 composer-rpm.patch | 26 +++++++++++++-------------
 composer.spec      | 21 ++++++++++++---------
 sources            |  2 +-
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index b6bccfb..ec7ff9b 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./bin/composer	2019-08-03 10:30:42.907772543 +0200
+--- ./bin/composer.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./bin/composer	2020-02-14 15:37:43.336528140 +0100
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
@@ -11,10 +11,10 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2019-08-03 10:30:42.908772550 +0200
-@@ -306,7 +306,7 @@ EOF;
-         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2020-02-14 15:37:43.336528140 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2020-02-14 15:38:56.710201606 +0100
+@@ -305,7 +305,7 @@ EOF;
+         $this->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
          $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
 -        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./src/Composer/Compiler.php	2019-08-03 10:30:42.908772550 +0200
+--- ./src/Composer/Compiler.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./src/Composer/Compiler.php	2020-02-14 15:37:43.336528140 +0100
 @@ -97,7 +97,7 @@ class Compiler
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2019-08-03 10:30:42.908772550 +0200
-+++ ./src/Composer/Json/JsonFile.php	2019-08-03 10:32:48.919630077 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2020-02-14 15:37:43.336528140 +0100
 @@ -34,7 +34,7 @@ class JsonFile
      const JSON_PRETTY_PRINT = 128;
      const JSON_UNESCAPED_UNICODE = 256;
@@ -46,7 +46,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      private $path;
      private $rfs;
-@@ -160,7 +160,7 @@ class JsonFile
+@@ -173,7 +173,7 @@ class JsonFile
          }
  
          if (null === $schemaFile) {
@@ -56,8 +56,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2019-08-03 10:30:10.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2019-08-03 10:30:42.908772550 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2020-02-14 15:37:41.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2020-02-14 15:37:43.336528140 +0100
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
diff --git a/composer.spec b/composer.spec
index 4854538..1ab1006 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    1291a16ce3f48bfdeca39d64fca4875098af4d7b
+%global gh_commit    472c917b2a083ec7d2fa25c55fd099d1300e2515
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.9.3
+%global upstream_version 1.10.0
 #global upstream_prever  RC
 
 %if 0
@@ -81,9 +81,9 @@ BuildRequires:  %{symfony_prefix}-filesystem
 BuildRequires:  %{symfony_prefix}-process
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^4.8.35 || ^5.7",
-#        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
-BuildRequires:  php-composer(phpunit/phpunit)           >= 4.8.35
+#        "symfony/phpunit-bridge": "^3.4",
+#        "phpspec/prophecy": "^1.10"
+BuildRequires:  phpunit
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
@@ -100,10 +100,10 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "psr/log": "^1.0"
 #        "seld/jsonlint": "~1.4",
 #        "seld/phar-utils": "^1.0",
-#        "symfony/console": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
-#        "symfony/process": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+#        "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+#        "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0",
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       php-justinrainbow-json-schema5
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Wed Mar 11 2020 Remi Collet <remi@remirepo.net> - 1.10.0-1
+- update to 1.10.0
+
 * Tue Feb  4 2020 Remi Collet <remi@remirepo.net> - 1.9.3-1
 - update to 1.9.3
 
diff --git a/sources b/sources
index b93fc6f..78f485b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.9.3-1291a16.tgz) = e65305862550cea87d693edb0a16c7957a40cdcd466506b60a8faa21f689fdd3161509217cb1e71c77873b6af4bd6f8470ae805156689517885f9f4792ef9e6d
+SHA512 (composer-1.10.0-472c917.tgz) = 69a1481c273e76034dd1ca09dc1c9ee7c48bf298c58c720360cc148255e2a2c840abf9e49d01747144645572c7348283046a9bea64a2f6a113c80429e00a1773

From a08145b039ce9da8edeb7bd3cd3c6ed121ef3612 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 16 Mar 2020 08:43:44 +0100
Subject: [PATCH 127/269] v1.10.1

---
 composer.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/composer.spec b/composer.spec
index a30fcca..c03e165 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    472c917b2a083ec7d2fa25c55fd099d1300e2515
+%global gh_commit    b912a45da3e2b22f5cb5a23e441b697a295ba011
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.10.0
+%global upstream_version 1.10.1
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Sat Mar 14 2020 Remi Collet <remi@remirepo.net> - 1.10.1-1
+- update to 1.10.1
+
 * Wed Mar 11 2020 Remi Collet <remi@remirepo.net> - 1.10.0-1
 - update to 1.10.0
 

From 86179dd0aa64affb6d14aaf4c6e6571eb8266cfd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 16 Mar 2020 08:48:37 +0100
Subject: [PATCH 128/269] v1.10.1 sources

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 78f485b..26856bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.0-472c917.tgz) = 69a1481c273e76034dd1ca09dc1c9ee7c48bf298c58c720360cc148255e2a2c840abf9e49d01747144645572c7348283046a9bea64a2f6a113c80429e00a1773
+SHA512 (composer-1.10.1-b912a45.tgz) = 1c596f6bc2b1e7456f0049221c05718e2f64372aa400e86c943cd5c3237a1b5a07294aa66cef54cecc2b0c5052ec17d24e6e55c468c7a8523650a754d7c7bbcb

From d7d25be3d6a7111015915620f9e23332c80261a2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 16 Mar 2020 08:43:44 +0100
Subject: [PATCH 129/269] v1.10.1

(cherry picked from commit 64d6db274c735701ef39e95c7471ec7542dcbf41)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 1ab1006..0c2d1c2 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    472c917b2a083ec7d2fa25c55fd099d1300e2515
+%global gh_commit    b912a45da3e2b22f5cb5a23e441b697a295ba011
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.10.0
+%global upstream_version 1.10.1
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Sat Mar 14 2020 Remi Collet <remi@remirepo.net> - 1.10.1-1
+- update to 1.10.1
+
 * Wed Mar 11 2020 Remi Collet <remi@remirepo.net> - 1.10.0-1
 - update to 1.10.0
 
diff --git a/sources b/sources
index 78f485b..26856bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.0-472c917.tgz) = 69a1481c273e76034dd1ca09dc1c9ee7c48bf298c58c720360cc148255e2a2c840abf9e49d01747144645572c7348283046a9bea64a2f6a113c80429e00a1773
+SHA512 (composer-1.10.1-b912a45.tgz) = 1c596f6bc2b1e7456f0049221c05718e2f64372aa400e86c943cd5c3237a1b5a07294aa66cef54cecc2b0c5052ec17d24e6e55c468c7a8523650a754d7c7bbcb

From 081a1a17c5dec568f217a143190657218b014f89 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 10 Apr 2020 07:52:54 +0200
Subject: [PATCH 130/269] v1.10.4

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index c03e165..e8f71cd 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    b912a45da3e2b22f5cb5a23e441b697a295ba011
+%global gh_commit    1efa6850b4a1740980346ac3582edf7dfb7899ee
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.10.1
+%global upstream_version 1.10.4
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Thu Apr  9 2020 Remi Collet <remi@remirepo.net> - 1.10.4-1
+- update to 1.10.4
+
 * Sat Mar 14 2020 Remi Collet <remi@remirepo.net> - 1.10.1-1
 - update to 1.10.1
 
diff --git a/sources b/sources
index 26856bd..6de493b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.1-b912a45.tgz) = 1c596f6bc2b1e7456f0049221c05718e2f64372aa400e86c943cd5c3237a1b5a07294aa66cef54cecc2b0c5052ec17d24e6e55c468c7a8523650a754d7c7bbcb
+SHA512 (composer-1.10.4-1efa685.tgz) = 3ef4e7d3d314ed276fd4e519294fbf5a3216f6b417f495b17fa665cc860c3fdd4ac782be876def0df5b07d0937feae8d1e3ec60ac604c5a4b1e0b45abd26ea18

From 61925d39ca363f97d2e699e979f8885875d43da5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 10 Apr 2020 07:52:54 +0200
Subject: [PATCH 131/269] v1.10.4

(cherry picked from commit 081a1a17c5dec568f217a143190657218b014f89)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 0c2d1c2..7576ffc 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    b912a45da3e2b22f5cb5a23e441b697a295ba011
+%global gh_commit    1efa6850b4a1740980346ac3582edf7dfb7899ee
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.10.1
+%global upstream_version 1.10.4
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Thu Apr  9 2020 Remi Collet <remi@remirepo.net> - 1.10.4-1
+- update to 1.10.4
+
 * Sat Mar 14 2020 Remi Collet <remi@remirepo.net> - 1.10.1-1
 - update to 1.10.1
 
diff --git a/sources b/sources
index 26856bd..6de493b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.1-b912a45.tgz) = 1c596f6bc2b1e7456f0049221c05718e2f64372aa400e86c943cd5c3237a1b5a07294aa66cef54cecc2b0c5052ec17d24e6e55c468c7a8523650a754d7c7bbcb
+SHA512 (composer-1.10.4-1efa685.tgz) = 3ef4e7d3d314ed276fd4e519294fbf5a3216f6b417f495b17fa665cc860c3fdd4ac782be876def0df5b07d0937feae8d1e3ec60ac604c5a4b1e0b45abd26ea18

From e2b6bf12334a8cef046fbc35ed927fcdd622b3da Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 10 Apr 2020 12:24:30 +0200
Subject: [PATCH 132/269] v1.10.5

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index e8f71cd..0bd2618 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    1efa6850b4a1740980346ac3582edf7dfb7899ee
+%global gh_commit    7a4d5b6aa30d2118af27c04f5e897b57156ccfa9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.10.4
+%global upstream_version 1.10.5
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Fri Apr 10 2020 Remi Collet <remi@remirepo.net> - 1.10.5-1
+- update to 1.10.5
+
 * Thu Apr  9 2020 Remi Collet <remi@remirepo.net> - 1.10.4-1
 - update to 1.10.4
 
diff --git a/sources b/sources
index 6de493b..18f1c69 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.4-1efa685.tgz) = 3ef4e7d3d314ed276fd4e519294fbf5a3216f6b417f495b17fa665cc860c3fdd4ac782be876def0df5b07d0937feae8d1e3ec60ac604c5a4b1e0b45abd26ea18
+SHA512 (composer-1.10.5-7a4d5b6.tgz) = 347e1063a864534434d2c61a7ebc75badd5b3e42b729866ce1a3fb1842055814994006cb65ad1cf13af3885e297ec05a990ba72439790189b634abcfbf6aa70a

From 64bf33a08291326ad258aa01a03f32f494659228 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 10 Apr 2020 12:24:30 +0200
Subject: [PATCH 133/269] v1.10.5

(cherry picked from commit e2b6bf12334a8cef046fbc35ed927fcdd622b3da)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 7576ffc..189614d 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    1efa6850b4a1740980346ac3582edf7dfb7899ee
+%global gh_commit    7a4d5b6aa30d2118af27c04f5e897b57156ccfa9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 
-%global upstream_version 1.10.4
+%global upstream_version 1.10.5
 #global upstream_prever  RC
 
 %if 0
@@ -279,6 +279,9 @@ exit $ret
 
 
 %changelog
+* Fri Apr 10 2020 Remi Collet <remi@remirepo.net> - 1.10.5-1
+- update to 1.10.5
+
 * Thu Apr  9 2020 Remi Collet <remi@remirepo.net> - 1.10.4-1
 - update to 1.10.4
 
diff --git a/sources b/sources
index 6de493b..18f1c69 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.4-1efa685.tgz) = 3ef4e7d3d314ed276fd4e519294fbf5a3216f6b417f495b17fa665cc860c3fdd4ac782be876def0df5b07d0937feae8d1e3ec60ac604c5a4b1e0b45abd26ea18
+SHA512 (composer-1.10.5-7a4d5b6.tgz) = 347e1063a864534434d2c61a7ebc75badd5b3e42b729866ce1a3fb1842055814994006cb65ad1cf13af3885e297ec05a990ba72439790189b634abcfbf6aa70a

From 962f6927f564abbddeb41122ce5c9d349b6f8bb5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 6 May 2020 11:11:43 +0200
Subject: [PATCH 134/269] update to 1.10.6 provide
 php-composer(composer-runtime-api)

---
 composer.spec | 22 ++++++++++++++++------
 sources       |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/composer.spec b/composer.spec
index 0bd2618..c7e2dda 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,15 +10,16 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    7a4d5b6aa30d2118af27c04f5e897b57156ccfa9
+%global gh_commit    be81b9c4735362c26876bdbfd3b5bc7e7f711c88
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
+%global run_version  1.0.0
 
-%global upstream_version 1.10.5
+%global upstream_version 1.10.6
 #global upstream_prever  RC
 
 %if 0
@@ -170,6 +171,7 @@ Requires:       php-zlib
 Provides:       php-composer(composer/composer) = %{version}
 # Special internal for Plugin API
 Provides:       php-composer(composer-plugin-api) = %{api_version}
+Provides:       php-composer(composer-runtime-api) = %{run_version}
 
 
 %description
@@ -209,10 +211,14 @@ sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \
 
 : check Plugin API version
 php -r '
-namespace Composer\Plugin;
-include "src/Composer/Plugin/PluginInterface.php";
-if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
-  printf("Plugin API version is %s, expected %s\n", PluginInterface::PLUGIN_API_VERSION, "%{api_version}");
+namespace Composer;
+include "src/Composer/autoload.php";
+if (version_compare(Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
+  printf("Plugin API version is %s, expected %s\n", Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}");
+  exit(1);
+}
+if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) {
+  printf("Plugin API version is %s, expected %s\n", Composer::RUNTIME_API_VERSION, "%{run_version}");
   exit(1);
 }'
 
@@ -279,6 +285,10 @@ exit $ret
 
 
 %changelog
+* Wed May  6 2020 Remi Collet <remi@remirepo.net> - 1.10.6-1
+- update to 1.10.6
+- provide php-composer(composer-runtime-api)
+
 * Fri Apr 10 2020 Remi Collet <remi@remirepo.net> - 1.10.5-1
 - update to 1.10.5
 
diff --git a/sources b/sources
index 18f1c69..6c5dbe9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.5-7a4d5b6.tgz) = 347e1063a864534434d2c61a7ebc75badd5b3e42b729866ce1a3fb1842055814994006cb65ad1cf13af3885e297ec05a990ba72439790189b634abcfbf6aa70a
+SHA512 (composer-1.10.6-be81b9c.tgz) = 447fe60a061eea920f32d5a94318bcea8351b1d5a2ce5e4683eaaa2d91215d7a5f920c765cb78ca2cc2afd74f748d4f2acaa2579b302e1c50e10033ea1e01600

From de91885e6dfaf12b0dd7df1c088abe21b092d3e2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 6 May 2020 11:11:43 +0200
Subject: [PATCH 135/269] update to 1.10.6 provide
 php-composer(composer-runtime-api)

(cherry picked from commit 962f6927f564abbddeb41122ce5c9d349b6f8bb5)
---
 composer.spec | 22 ++++++++++++++++------
 sources       |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/composer.spec b/composer.spec
index 189614d..1428976 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,15 +10,16 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    7a4d5b6aa30d2118af27c04f5e897b57156ccfa9
+%global gh_commit    be81b9c4735362c26876bdbfd3b5bc7e7f711c88
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
+%global run_version  1.0.0
 
-%global upstream_version 1.10.5
+%global upstream_version 1.10.6
 #global upstream_prever  RC
 
 %if 0
@@ -170,6 +171,7 @@ Requires:       php-zlib
 Provides:       php-composer(composer/composer) = %{version}
 # Special internal for Plugin API
 Provides:       php-composer(composer-plugin-api) = %{api_version}
+Provides:       php-composer(composer-runtime-api) = %{run_version}
 
 
 %description
@@ -209,10 +211,14 @@ sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \
 
 : check Plugin API version
 php -r '
-namespace Composer\Plugin;
-include "src/Composer/Plugin/PluginInterface.php";
-if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
-  printf("Plugin API version is %s, expected %s\n", PluginInterface::PLUGIN_API_VERSION, "%{api_version}");
+namespace Composer;
+include "src/Composer/autoload.php";
+if (version_compare(Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
+  printf("Plugin API version is %s, expected %s\n", Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}");
+  exit(1);
+}
+if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) {
+  printf("Plugin API version is %s, expected %s\n", Composer::RUNTIME_API_VERSION, "%{run_version}");
   exit(1);
 }'
 
@@ -279,6 +285,10 @@ exit $ret
 
 
 %changelog
+* Wed May  6 2020 Remi Collet <remi@remirepo.net> - 1.10.6-1
+- update to 1.10.6
+- provide php-composer(composer-runtime-api)
+
 * Fri Apr 10 2020 Remi Collet <remi@remirepo.net> - 1.10.5-1
 - update to 1.10.5
 
diff --git a/sources b/sources
index 18f1c69..6c5dbe9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.5-7a4d5b6.tgz) = 347e1063a864534434d2c61a7ebc75badd5b3e42b729866ce1a3fb1842055814994006cb65ad1cf13af3885e297ec05a990ba72439790189b634abcfbf6aa70a
+SHA512 (composer-1.10.6-be81b9c.tgz) = 447fe60a061eea920f32d5a94318bcea8351b1d5a2ce5e4683eaaa2d91215d7a5f920c765cb78ca2cc2afd74f748d4f2acaa2579b302e1c50e10033ea1e01600

From ffd5f6b34d5916c92577e121e63c9eddc67734d7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 3 Jun 2020 11:52:12 +0200
Subject: [PATCH 136/269] update to 1.10.7 raise dependency on
 justinrainbow/json-schema 5.2.10

---
 composer.spec | 86 +++++++++++++++++++++++----------------------------
 sources       |  2 +-
 2 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/composer.spec b/composer.spec
index c7e2dda..6de2a60 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    be81b9c4735362c26876bdbfd3b5bc7e7f711c88
+%global gh_commit    956608ea4f7de9e58c53dfb019d85ae62b193c39
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -19,7 +19,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.6
+%global upstream_version 1.10.7
 #global upstream_prever  RC
 
 %if 0
@@ -51,30 +51,24 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-justinrainbow-json-schema5
 %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/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
-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)
-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(composer/ca-bundle)        >= 1.0    with  php-composer(composer/ca-bundle)        <  2)
+BuildRequires:  (php-composer(composer/semver)           >= 1.0    with  php-composer(composer/semver)           <  2)
+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)
+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(justinrainbow/json-schema) >= 5.2.10 with  php-composer(justinrainbow/json-schema) <  6)
 %else
-BuildRequires:  php-composer(composer/ca-bundle)        <  2
-BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
-BuildRequires:  php-composer(composer/semver)           <  2
-BuildRequires:  php-composer(composer/semver)           >= 1.0
-BuildRequires:  php-composer(composer/spdx-licenses)    <  2
-BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
-BuildRequires:  php-composer(composer/xdebug-handler)   >= 1.1
-BuildRequires:  php-composer(composer/xdebug-handler)   <  2
-BuildRequires:  php-composer(seld/jsonlint)             <  2
-BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
-BuildRequires:  php-composer(seld/phar-utils)           <  2
-BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
-BuildRequires:  php-composer(psr/log)                   <  2
-BuildRequires:  php-composer(psr/log)                   >= 1.0
+BuildRequires:  php-composer-ca-bundle
+BuildRequires:  php-composer-semver
+BuildRequires:  php-composer-spdx-licenses               >= 1.2
+BuildRequires:  php-composer-xdebug-handler              >= 1.1
+BuildRequires:  php-jsonlint                             >= 1.4
+BuildRequires:  php-seld-phar-utils
+BuildRequires:  php-PsrLog
+BuildRequires:  php-justinrainbow-json-schema5           >= 5.2.10
 %endif
 BuildRequires:  %{symfony_prefix}-console
 BuildRequires:  %{symfony_prefix}-finder
@@ -97,7 +91,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.2",
 #        "composer/xdebug-handler": "^1.1",
-#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+#        "justinrainbow/json-schema": "^5.2.10",
 #        "psr/log": "^1.0"
 #        "seld/jsonlint": "~1.4",
 #        "seld/phar-utils": "^1.0",
@@ -107,30 +101,24 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0",
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-justinrainbow-json-schema5
 %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/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
-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)
-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(composer/ca-bundle)        >= 1.0    with  php-composer(composer/ca-bundle)        <  2)
+Requires:       (php-composer(composer/semver)           >= 1.0    with  php-composer(composer/semver)           <  2)
+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)
+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(justinrainbow/json-schema) >= 5.2.10 with  php-composer(justinrainbow/json-schema) <  6)
 %else
-Requires:       php-composer(composer/ca-bundle)        >= 1.0
-Requires:       php-composer(composer/ca-bundle)        <  2
-Requires:       php-composer(composer/semver)           >= 1.0
-Requires:       php-composer(composer/semver)           <  2
-Requires:       php-composer(composer/spdx-licenses)    >= 1.2
-Requires:       php-composer(composer/spdx-licenses)    <  2
-Requires:       php-composer(composer/xdebug-handler)   >= 1.1
-Requires:       php-composer(composer/xdebug-handler)   <  2
-Requires:       php-composer(seld/jsonlint)             >= 1.4
-Requires:       php-composer(seld/jsonlint)             <  2
-Requires:       php-composer(seld/phar-utils)           >= 1.0
-Requires:       php-composer(seld/phar-utils)           <  2
-Requires:       php-composer(psr/log)                   >= 1.0
-Requires:       php-composer(psr/log)                   <  2
+Requires:       php-composer-ca-bundle
+Requires:       php-composer-semver
+Requires:       php-composer-spdx-licenses               >= 1.2
+Requires:       php-composer-xdebug-handler              >= 1.1
+Requires:       php-jsonlint                             >= 1.4
+Requires:       php-seld-phar-utils
+Requires:       php-PsrLog
+Requires:       php-justinrainbow-json-schema5           >= 5.2.10
 %endif
 Requires:       %{symfony_prefix}-console
 Requires:       %{symfony_prefix}-finder
@@ -285,6 +273,10 @@ exit $ret
 
 
 %changelog
+* Wed Jun  3 2020 Remi Collet <remi@remirepo.net> - 1.10.7-1
+- update to 1.10.7
+- raise dependency on justinrainbow/json-schema 5.2.10
+
 * Wed May  6 2020 Remi Collet <remi@remirepo.net> - 1.10.6-1
 - update to 1.10.6
 - provide php-composer(composer-runtime-api)
diff --git a/sources b/sources
index 6c5dbe9..acb3442 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.6-be81b9c.tgz) = 447fe60a061eea920f32d5a94318bcea8351b1d5a2ce5e4683eaaa2d91215d7a5f920c765cb78ca2cc2afd74f748d4f2acaa2579b302e1c50e10033ea1e01600
+SHA512 (composer-1.10.7-956608e.tgz) = 4b246289f86f2855808e9c03c80cc0ecf9b26f5f09f91fa09baff51d7e7245fbda50b247275333b783d894b87976a514ebf1301108238780750537ba935b50e7

From e0ad692a7b725a59d3457c7bed288fb405758370 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 3 Jun 2020 11:52:12 +0200
Subject: [PATCH 137/269] update to 1.10.7 raise dependency on
 justinrainbow/json-schema 5.2.10

(cherry picked from commit ffd5f6b34d5916c92577e121e63c9eddc67734d7)
---
 composer.spec | 86 +++++++++++++++++++++++----------------------------
 sources       |  2 +-
 2 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/composer.spec b/composer.spec
index 1428976..9058b12 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    be81b9c4735362c26876bdbfd3b5bc7e7f711c88
+%global gh_commit    956608ea4f7de9e58c53dfb019d85ae62b193c39
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -19,7 +19,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.6
+%global upstream_version 1.10.7
 #global upstream_prever  RC
 
 %if 0
@@ -51,30 +51,24 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-justinrainbow-json-schema5
 %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/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
-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)
-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(composer/ca-bundle)        >= 1.0    with  php-composer(composer/ca-bundle)        <  2)
+BuildRequires:  (php-composer(composer/semver)           >= 1.0    with  php-composer(composer/semver)           <  2)
+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)
+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(justinrainbow/json-schema) >= 5.2.10 with  php-composer(justinrainbow/json-schema) <  6)
 %else
-BuildRequires:  php-composer(composer/ca-bundle)        <  2
-BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
-BuildRequires:  php-composer(composer/semver)           <  2
-BuildRequires:  php-composer(composer/semver)           >= 1.0
-BuildRequires:  php-composer(composer/spdx-licenses)    <  2
-BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
-BuildRequires:  php-composer(composer/xdebug-handler)   >= 1.1
-BuildRequires:  php-composer(composer/xdebug-handler)   <  2
-BuildRequires:  php-composer(seld/jsonlint)             <  2
-BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
-BuildRequires:  php-composer(seld/phar-utils)           <  2
-BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
-BuildRequires:  php-composer(psr/log)                   <  2
-BuildRequires:  php-composer(psr/log)                   >= 1.0
+BuildRequires:  php-composer-ca-bundle
+BuildRequires:  php-composer-semver
+BuildRequires:  php-composer-spdx-licenses               >= 1.2
+BuildRequires:  php-composer-xdebug-handler              >= 1.1
+BuildRequires:  php-jsonlint                             >= 1.4
+BuildRequires:  php-seld-phar-utils
+BuildRequires:  php-PsrLog
+BuildRequires:  php-justinrainbow-json-schema5           >= 5.2.10
 %endif
 BuildRequires:  %{symfony_prefix}-console
 BuildRequires:  %{symfony_prefix}-finder
@@ -97,7 +91,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.2",
 #        "composer/xdebug-handler": "^1.1",
-#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+#        "justinrainbow/json-schema": "^5.2.10",
 #        "psr/log": "^1.0"
 #        "seld/jsonlint": "~1.4",
 #        "seld/phar-utils": "^1.0",
@@ -107,30 +101,24 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0",
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-justinrainbow-json-schema5
 %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/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
-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)
-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(composer/ca-bundle)        >= 1.0    with  php-composer(composer/ca-bundle)        <  2)
+Requires:       (php-composer(composer/semver)           >= 1.0    with  php-composer(composer/semver)           <  2)
+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)
+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(justinrainbow/json-schema) >= 5.2.10 with  php-composer(justinrainbow/json-schema) <  6)
 %else
-Requires:       php-composer(composer/ca-bundle)        >= 1.0
-Requires:       php-composer(composer/ca-bundle)        <  2
-Requires:       php-composer(composer/semver)           >= 1.0
-Requires:       php-composer(composer/semver)           <  2
-Requires:       php-composer(composer/spdx-licenses)    >= 1.2
-Requires:       php-composer(composer/spdx-licenses)    <  2
-Requires:       php-composer(composer/xdebug-handler)   >= 1.1
-Requires:       php-composer(composer/xdebug-handler)   <  2
-Requires:       php-composer(seld/jsonlint)             >= 1.4
-Requires:       php-composer(seld/jsonlint)             <  2
-Requires:       php-composer(seld/phar-utils)           >= 1.0
-Requires:       php-composer(seld/phar-utils)           <  2
-Requires:       php-composer(psr/log)                   >= 1.0
-Requires:       php-composer(psr/log)                   <  2
+Requires:       php-composer-ca-bundle
+Requires:       php-composer-semver
+Requires:       php-composer-spdx-licenses               >= 1.2
+Requires:       php-composer-xdebug-handler              >= 1.1
+Requires:       php-jsonlint                             >= 1.4
+Requires:       php-seld-phar-utils
+Requires:       php-PsrLog
+Requires:       php-justinrainbow-json-schema5           >= 5.2.10
 %endif
 Requires:       %{symfony_prefix}-console
 Requires:       %{symfony_prefix}-finder
@@ -285,6 +273,10 @@ exit $ret
 
 
 %changelog
+* Wed Jun  3 2020 Remi Collet <remi@remirepo.net> - 1.10.7-1
+- update to 1.10.7
+- raise dependency on justinrainbow/json-schema 5.2.10
+
 * Wed May  6 2020 Remi Collet <remi@remirepo.net> - 1.10.6-1
 - update to 1.10.6
 - provide php-composer(composer-runtime-api)
diff --git a/sources b/sources
index 6c5dbe9..acb3442 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.6-be81b9c.tgz) = 447fe60a061eea920f32d5a94318bcea8351b1d5a2ce5e4683eaaa2d91215d7a5f920c765cb78ca2cc2afd74f748d4f2acaa2579b302e1c50e10033ea1e01600
+SHA512 (composer-1.10.7-956608e.tgz) = 4b246289f86f2855808e9c03c80cc0ecf9b26f5f09f91fa09baff51d7e7245fbda50b247275333b783d894b87976a514ebf1301108238780750537ba935b50e7

From d86d74457f2368f68226b8f272a531e2aed290db Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 25 Jun 2020 07:17:15 +0200
Subject: [PATCH 138/269] v1.0.8

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index 6de2a60..5cfab86 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    956608ea4f7de9e58c53dfb019d85ae62b193c39
+%global gh_commit    56e0e094478f30935e9128552188355fa9712291
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -19,7 +19,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.7
+%global upstream_version 1.10.8
 #global upstream_prever  RC
 
 %if 0
@@ -76,7 +76,7 @@ BuildRequires:  %{symfony_prefix}-filesystem
 BuildRequires:  %{symfony_prefix}-process
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
-#        "symfony/phpunit-bridge": "^3.4",
+#        "symfony/phpunit-bridge": "^4.2",
 #        "phpspec/prophecy": "^1.10"
 BuildRequires:  phpunit
 # For autoloader
@@ -273,6 +273,9 @@ exit $ret
 
 
 %changelog
+* Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 1.10.8-1
+- update to 1.10.8
+
 * Wed Jun  3 2020 Remi Collet <remi@remirepo.net> - 1.10.7-1
 - update to 1.10.7
 - raise dependency on justinrainbow/json-schema 5.2.10
diff --git a/sources b/sources
index acb3442..deec5a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.7-956608e.tgz) = 4b246289f86f2855808e9c03c80cc0ecf9b26f5f09f91fa09baff51d7e7245fbda50b247275333b783d894b87976a514ebf1301108238780750537ba935b50e7
+SHA512 (composer-1.10.8-56e0e09.tgz) = 750106b846755706294689414102dab60d6bc10b674f1d9551e6e592810e542e532e210f5f8d1dd2185d6c615da68ad62e28726a2ba2da95ffeac26a5a7d1038

From 792cfb93ab831c905b27f857e8eab3ba3b0c2ae3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 25 Jun 2020 07:17:15 +0200
Subject: [PATCH 139/269] v1.0.8

(cherry picked from commit d86d74457f2368f68226b8f272a531e2aed290db)
---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index 9058b12..563ff66 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    956608ea4f7de9e58c53dfb019d85ae62b193c39
+%global gh_commit    56e0e094478f30935e9128552188355fa9712291
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -19,7 +19,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.7
+%global upstream_version 1.10.8
 #global upstream_prever  RC
 
 %if 0
@@ -76,7 +76,7 @@ BuildRequires:  %{symfony_prefix}-filesystem
 BuildRequires:  %{symfony_prefix}-process
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
-#        "symfony/phpunit-bridge": "^3.4",
+#        "symfony/phpunit-bridge": "^4.2",
 #        "phpspec/prophecy": "^1.10"
 BuildRequires:  phpunit
 # For autoloader
@@ -273,6 +273,9 @@ exit $ret
 
 
 %changelog
+* Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 1.10.8-1
+- update to 1.10.8
+
 * Wed Jun  3 2020 Remi Collet <remi@remirepo.net> - 1.10.7-1
 - update to 1.10.7
 - raise dependency on justinrainbow/json-schema 5.2.10
diff --git a/sources b/sources
index acb3442..deec5a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.7-956608e.tgz) = 4b246289f86f2855808e9c03c80cc0ecf9b26f5f09f91fa09baff51d7e7245fbda50b247275333b783d894b87976a514ebf1301108238780750537ba935b50e7
+SHA512 (composer-1.10.8-56e0e09.tgz) = 750106b846755706294689414102dab60d6bc10b674f1d9551e6e592810e542e532e210f5f8d1dd2185d6c615da68ad62e28726a2ba2da95ffeac26a5a7d1038

From b73e196093d30be6e4c231fdfbca18e0ffa88ad3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 16 Jul 2020 13:59:40 +0200
Subject: [PATCH 140/269] v1.10.9

---
 composer.spec | 14 +++++++++-----
 sources       |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/composer.spec b/composer.spec
index 5cfab86..d846614 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,16 +10,17 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    56e0e094478f30935e9128552188355fa9712291
+%bcond_without       tests
+
+%global gh_commit    83c3250093d5491600a822e176b107a945baf95a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
 %global gh_project   composer
-%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.8
+%global upstream_version 1.10.9
 #global upstream_prever  RC
 
 %if 0
@@ -50,7 +51,7 @@ Patch0:         %{name}-rpm.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
-%if %{with_tests}
+%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/semver)           >= 1.0    with  php-composer(composer/semver)           <  2)
@@ -236,7 +237,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 : Online tests
 rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
@@ -273,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Thu Jul 16 2020 Remi Collet <remi@remirepo.net> - 1.10.9-1
+- update to 1.10.9
+
 * Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 1.10.8-1
 - update to 1.10.8
 
diff --git a/sources b/sources
index deec5a6..e50b8a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.8-56e0e09.tgz) = 750106b846755706294689414102dab60d6bc10b674f1d9551e6e592810e542e532e210f5f8d1dd2185d6c615da68ad62e28726a2ba2da95ffeac26a5a7d1038
+SHA512 (composer-1.10.9-83c3250.tgz) = 12006270a3ec6955daba1f442fb9489bb7f0f4f3ca318267c2e4606712fe3cc00a43a6fa8a53a867a857fb073ecee3f9f2997407780cb8129b7a7b9fde19672c

From 92a878bb9bfaa68cb1a8cba453a3cb45cf54943a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 16 Jul 2020 13:59:40 +0200
Subject: [PATCH 141/269] v1.10.9

(cherry picked from commit b73e196093d30be6e4c231fdfbca18e0ffa88ad3)
---
 composer.spec | 14 +++++++++-----
 sources       |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/composer.spec b/composer.spec
index 563ff66..f7f52d7 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,16 +10,17 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    56e0e094478f30935e9128552188355fa9712291
+%bcond_without       tests
+
+%global gh_commit    83c3250093d5491600a822e176b107a945baf95a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
 %global gh_project   composer
-%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.8
+%global upstream_version 1.10.9
 #global upstream_prever  RC
 
 %if 0
@@ -50,7 +51,7 @@ Patch0:         %{name}-rpm.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
-%if %{with_tests}
+%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/semver)           >= 1.0    with  php-composer(composer/semver)           <  2)
@@ -236,7 +237,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 : Online tests
 rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
@@ -273,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Thu Jul 16 2020 Remi Collet <remi@remirepo.net> - 1.10.9-1
+- update to 1.10.9
+
 * Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 1.10.8-1
 - update to 1.10.8
 
diff --git a/sources b/sources
index deec5a6..e50b8a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.8-56e0e09.tgz) = 750106b846755706294689414102dab60d6bc10b674f1d9551e6e592810e542e532e210f5f8d1dd2185d6c615da68ad62e28726a2ba2da95ffeac26a5a7d1038
+SHA512 (composer-1.10.9-83c3250.tgz) = 12006270a3ec6955daba1f442fb9489bb7f0f4f3ca318267c2e4606712fe3cc00a43a6fa8a53a867a857fb073ecee3f9f2997407780cb8129b7a7b9fde19672c

From bf5cbc3fc4caabb6df08a604f4954032d4e90c81 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 14:27:02 +0000
Subject: [PATCH 142/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index d846614..d7bc55e 100644
--- a/composer.spec
+++ b/composer.spec
@@ -32,7 +32,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jul 16 2020 Remi Collet <remi@remirepo.net> - 1.10.9-1
 - update to 1.10.9
 

From 56409bcb5688bfa50016d42f0633fc087ab6fbd4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 10 Aug 2020 13:43:35 +0200
Subject: [PATCH 143/269] v1.10.10

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index d7bc55e..817cf62 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    83c3250093d5491600a822e176b107a945baf95a
+%global gh_commit    32966a3b1d48bc01472a8321fd6472b44fad033a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.9
+%global upstream_version 1.10.10
 #global upstream_prever  RC
 
 %if 0
@@ -32,7 +32,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Tue Aug  4 2020 Remi Collet <remi@remirepo.net> - 1.10.10-1
+- update to 1.10.10
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index e50b8a4..7d18c52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.9-83c3250.tgz) = 12006270a3ec6955daba1f442fb9489bb7f0f4f3ca318267c2e4606712fe3cc00a43a6fa8a53a867a857fb073ecee3f9f2997407780cb8129b7a7b9fde19672c
+SHA512 (composer-1.10.10-32966a3.tgz) = 08a09b0e000b7af767e05f012fc3b69967dc6957a561e988afccb0cb5d4104dc15257e094f30ee5fe83bcb1be1aef343e0fc281deef89c35fb899793a4a2a680

From 2c303639ed30e243e39beba3276154591b5d1dcb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 10 Aug 2020 13:43:35 +0200
Subject: [PATCH 144/269] v1.10.10

(cherry picked from commit 56409bcb5688bfa50016d42f0633fc087ab6fbd4)
(cherry picked from commit 8c6056c7ae1a55247fb03128809a27004ac5660a)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index f7f52d7..7990c95 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    83c3250093d5491600a822e176b107a945baf95a
+%global gh_commit    32966a3b1d48bc01472a8321fd6472b44fad033a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.9
+%global upstream_version 1.10.10
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Tue Aug  4 2020 Remi Collet <remi@remirepo.net> - 1.10.10-1
+- update to 1.10.10
+
 * Thu Jul 16 2020 Remi Collet <remi@remirepo.net> - 1.10.9-1
 - update to 1.10.9
 
diff --git a/sources b/sources
index e50b8a4..7d18c52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.9-83c3250.tgz) = 12006270a3ec6955daba1f442fb9489bb7f0f4f3ca318267c2e4606712fe3cc00a43a6fa8a53a867a857fb073ecee3f9f2997407780cb8129b7a7b9fde19672c
+SHA512 (composer-1.10.10-32966a3.tgz) = 08a09b0e000b7af767e05f012fc3b69967dc6957a561e988afccb0cb5d4104dc15257e094f30ee5fe83bcb1be1aef343e0fc281deef89c35fb899793a4a2a680

From 75f7b83134110cd72ea68ab23ef5cfd43a2513b4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 9 Sep 2020 07:47:25 +0200
Subject: [PATCH 145/269] v1.10.12

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 817cf62..602a34c 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    32966a3b1d48bc01472a8321fd6472b44fad033a
+%global gh_commit    a6cc92b39c796ec3fb9a360f9c0e578afc2fc96d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.10
+%global upstream_version 1.10.12
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 1.10.12-1
+- update to 1.10.12
+
 * Tue Aug  4 2020 Remi Collet <remi@remirepo.net> - 1.10.10-1
 - update to 1.10.10
 
diff --git a/sources b/sources
index 7d18c52..7418b78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.10-32966a3.tgz) = 08a09b0e000b7af767e05f012fc3b69967dc6957a561e988afccb0cb5d4104dc15257e094f30ee5fe83bcb1be1aef343e0fc281deef89c35fb899793a4a2a680
+SHA512 (composer-1.10.12-a6cc92b.tgz) = ee52476a572cd725b0d9e5c0e58dc5c00392d775924d1d4ae2047e51a49e4960c65f45c362def13833af285686656c624b8faa1116aa54fb5ef155fa2325689a

From 6c6c156fe913ebb7bcc93cb96011123e5b2811b7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 9 Sep 2020 07:47:25 +0200
Subject: [PATCH 146/269] v1.10.12

(cherry picked from commit 75f7b83134110cd72ea68ab23ef5cfd43a2513b4)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 7990c95..320870a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    32966a3b1d48bc01472a8321fd6472b44fad033a
+%global gh_commit    a6cc92b39c796ec3fb9a360f9c0e578afc2fc96d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.10
+%global upstream_version 1.10.12
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 1.10.12-1
+- update to 1.10.12
+
 * Tue Aug  4 2020 Remi Collet <remi@remirepo.net> - 1.10.10-1
 - update to 1.10.10
 
diff --git a/sources b/sources
index 7d18c52..7418b78 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.10-32966a3.tgz) = 08a09b0e000b7af767e05f012fc3b69967dc6957a561e988afccb0cb5d4104dc15257e094f30ee5fe83bcb1be1aef343e0fc281deef89c35fb899793a4a2a680
+SHA512 (composer-1.10.12-a6cc92b.tgz) = ee52476a572cd725b0d9e5c0e58dc5c00392d775924d1d4ae2047e51a49e4960c65f45c362def13833af285686656c624b8faa1116aa54fb5ef155fa2325689a

From f5bea90eaac884f5e4b1359ce1e95738a23cd7d0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 9 Sep 2020 14:13:22 +0200
Subject: [PATCH 147/269] v1.10.13

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 602a34c..780a77d 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    a6cc92b39c796ec3fb9a360f9c0e578afc2fc96d
+%global gh_commit    47c841ba3b2d3fc0b4b13282cf029ea18b66d78b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.12
+%global upstream_version 1.10.13
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 1.10.13-1
+- update to 1.10.13
+
 * Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 1.10.12-1
 - update to 1.10.12
 
diff --git a/sources b/sources
index 7418b78..42fcdd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.12-a6cc92b.tgz) = ee52476a572cd725b0d9e5c0e58dc5c00392d775924d1d4ae2047e51a49e4960c65f45c362def13833af285686656c624b8faa1116aa54fb5ef155fa2325689a
+SHA512 (composer-1.10.13-47c841b.tgz) = 39cc95dabcaadf8ad30e81ae2a936ae81d785ec263534858f10cd727edf5820f8ba944722347bf7a6fa487d1069f7e9f32eff331fd275ee596688c5122dd5761

From 7cb6bd1499a1e0610bba2a871f1c35c5c1a5e13c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 9 Sep 2020 14:13:22 +0200
Subject: [PATCH 148/269] v1.10.13

(cherry picked from commit f5bea90eaac884f5e4b1359ce1e95738a23cd7d0)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 320870a..6af9f2b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    a6cc92b39c796ec3fb9a360f9c0e578afc2fc96d
+%global gh_commit    47c841ba3b2d3fc0b4b13282cf029ea18b66d78b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.12
+%global upstream_version 1.10.13
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 1.10.13-1
+- update to 1.10.13
+
 * Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 1.10.12-1
 - update to 1.10.12
 
diff --git a/sources b/sources
index 7418b78..42fcdd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.12-a6cc92b.tgz) = ee52476a572cd725b0d9e5c0e58dc5c00392d775924d1d4ae2047e51a49e4960c65f45c362def13833af285686656c624b8faa1116aa54fb5ef155fa2325689a
+SHA512 (composer-1.10.13-47c841b.tgz) = 39cc95dabcaadf8ad30e81ae2a936ae81d785ec263534858f10cd727edf5820f8ba944722347bf7a6fa487d1069f7e9f32eff331fd275ee596688c5122dd5761

From a71ecb8fc5f7e0f6e2c557a9735b2ee2079ae8e5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 13 Oct 2020 16:12:05 +0200
Subject: [PATCH 149/269] v1.10.15

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 780a77d..638d41d 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    47c841ba3b2d3fc0b4b13282cf029ea18b66d78b
+%global gh_commit    547c9ee73fe26c77af09a0ea16419176b1cdbd12
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.13
+%global upstream_version 1.10.15
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Tue Oct 13 2020 Remi Collet <remi@remirepo.net> - 1.10.15-1
+- update to 1.10.15
+
 * Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 1.10.13-1
 - update to 1.10.13
 
diff --git a/sources b/sources
index 42fcdd7..503aa56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.13-47c841b.tgz) = 39cc95dabcaadf8ad30e81ae2a936ae81d785ec263534858f10cd727edf5820f8ba944722347bf7a6fa487d1069f7e9f32eff331fd275ee596688c5122dd5761
+SHA512 (composer-1.10.15-547c9ee.tgz) = 0e70f80775ec0136bacef5da353efbbc9786e4eb33b8e209c9b3350a3dbe8d65784ac3e920cc2b605f08e03d5dbe9c823505750ed9c04fcbfc85b438b800c66c

From 62d7c356546132ce97cf716893f45c7153187ac8 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 13 Oct 2020 16:12:05 +0200
Subject: [PATCH 150/269] v1.10.15

(cherry picked from commit a71ecb8fc5f7e0f6e2c557a9735b2ee2079ae8e5)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 6af9f2b..62b5881 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    47c841ba3b2d3fc0b4b13282cf029ea18b66d78b
+%global gh_commit    547c9ee73fe26c77af09a0ea16419176b1cdbd12
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.13
+%global upstream_version 1.10.15
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Tue Oct 13 2020 Remi Collet <remi@remirepo.net> - 1.10.15-1
+- update to 1.10.15
+
 * Wed Sep  9 2020 Remi Collet <remi@remirepo.net> - 1.10.13-1
 - update to 1.10.13
 
diff --git a/sources b/sources
index 42fcdd7..503aa56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.13-47c841b.tgz) = 39cc95dabcaadf8ad30e81ae2a936ae81d785ec263534858f10cd727edf5820f8ba944722347bf7a6fa487d1069f7e9f32eff331fd275ee596688c5122dd5761
+SHA512 (composer-1.10.15-547c9ee.tgz) = 0e70f80775ec0136bacef5da353efbbc9786e4eb33b8e209c9b3350a3dbe8d65784ac3e920cc2b605f08e03d5dbe9c823505750ed9c04fcbfc85b438b800c66c

From 6a971eb74d9259c5f208ca600a757e81d0504379 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 26 Oct 2020 10:38:32 +0100
Subject: [PATCH 151/269] v1.10.16

(cherry picked from commit 6bb52a76e00dda3328d377a455c1a4db493e2b63)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 62b5881..4fde968 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    547c9ee73fe26c77af09a0ea16419176b1cdbd12
+%global gh_commit    217f0272673c72087862c40cf91ac07eb438d778
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.15
+%global upstream_version 1.10.16
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Sun Oct 25 2020 Remi Collet <remi@remirepo.net> - 1.10.16-1
+- update to 1.10.16
+
 * Tue Oct 13 2020 Remi Collet <remi@remirepo.net> - 1.10.15-1
 - update to 1.10.15
 
diff --git a/sources b/sources
index 503aa56..590f23b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.15-547c9ee.tgz) = 0e70f80775ec0136bacef5da353efbbc9786e4eb33b8e209c9b3350a3dbe8d65784ac3e920cc2b605f08e03d5dbe9c823505750ed9c04fcbfc85b438b800c66c
+SHA512 (composer-1.10.16-217f027.tgz) = 2bb7818cb64863111982e6051701a5be74140590568a452330720783336bbd721318ea270c354a22a4c25b15a65e9c6f3a5c7ff1c89e272ed0cb33ec402ce85a

From 6a289b8d43d652c72d9c970bcd008d02ba778637 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 26 Oct 2020 10:47:27 +0100
Subject: [PATCH 152/269] update to 2.0.2 raise dependency on composer/semver 3
 add dependency on react/promise 2.7

---
 composer-autoload.php  |  24 --------
 composer-bootstrap.php |   3 -
 composer-rpm.patch     |  80 ++++++++++++++++++-------
 composer.spec          | 131 ++++++++++++++++++++++++++---------------
 sources                |   2 +-
 5 files changed, 142 insertions(+), 98 deletions(-)
 delete mode 100644 composer-autoload.php
 delete mode 100644 composer-bootstrap.php

diff --git a/composer-autoload.php b/composer-autoload.php
deleted file mode 100644
index 15e9c21..0000000
--- a/composer-autoload.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/* Autoloader for composer/composer and its dependencies */
-
-$vendorDir = '/usr/share/php';
-require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
-
-\Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__);
-
-// Dependencies
-\Fedora\Autoloader\Dependencies::required([
-	$vendorDir . '/Symfony/Component/Console/autoload.php',
-	$vendorDir . '/Symfony/Component/Finder/autoload.php',
-	$vendorDir . '/Symfony/Component/Process/autoload.php',
-	$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
-	$vendorDir . '/Seld/JsonLint/autoload.php',
-	$vendorDir . '/Seld/PharUtils/autoload.php',
-	$vendorDir . '/Composer/CaBundle/autoload.php',
-	$vendorDir . '/Composer/Spdx/autoload.php',
-	$vendorDir . '/Composer/Semver/autoload.php',
-	$vendorDir . '/Composer/XdebugHandler/autoload.php',
-	$vendorDir . '/Psr/Log/autoload.php',
-	$vendorDir . '/JsonSchema5/autoload.php',
-]);
-
diff --git a/composer-bootstrap.php b/composer-bootstrap.php
deleted file mode 100644
index 19d75b3..0000000
--- a/composer-bootstrap.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-require 'Composer/autoload.php';
-\Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/');
diff --git a/composer-rpm.patch b/composer-rpm.patch
index ec7ff9b..f027f60 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2020-02-14 15:37:41.000000000 +0100
-+++ ./bin/composer	2020-02-14 15:37:43.336528140 +0100
+--- ./bin/composer.rpm	2020-10-25 06:23:06.000000000 +0100
++++ ./bin/composer	2020-10-25 06:23:12.862707931 +0100
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
@@ -11,32 +11,32 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2020-02-14 15:37:43.336528140 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2020-02-14 15:38:56.710201606 +0100
-@@ -305,7 +305,7 @@ EOF;
-         $this->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2020-10-25 06:23:06.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2020-10-25 06:23:12.863707931 +0100
+@@ -364,7 +364,7 @@ EOF;
+         $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform));
  
-         $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
--        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
-+        $this->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE');
+         $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
+-        $filesystem->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
++        $filesystem->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE');
  
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2020-02-14 15:37:41.000000000 +0100
-+++ ./src/Composer/Compiler.php	2020-02-14 15:37:43.336528140 +0100
-@@ -97,7 +97,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm	2020-10-25 06:23:12.863707931 +0100
++++ ./src/Composer/Compiler.php	2020-10-25 06:26:14.912591239 +0100
+@@ -99,7 +99,7 @@ class Compiler
+         // Add Composer resources
          $finder = new Finder();
          $finder->files()
-             ->name('*.json')
 -            ->in(__DIR__.'/../../res')
 +            ->in((getenv('BUILDROOT')?:'') . '/usr/share/composer/res')
-             ->in(SpdxLicenses::getResourcesDir())
              ->sort($finderSort)
          ;
+         foreach ($finder as $file) {
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2020-02-14 15:37:41.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2020-02-14 15:37:43.336528140 +0100
+--- ./src/Composer/Json/JsonFile.php.rpm	2020-10-25 06:23:06.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2020-10-25 06:23:12.863707931 +0100
 @@ -34,7 +34,7 @@ class JsonFile
      const JSON_PRETTY_PRINT = 128;
      const JSON_UNESCAPED_UNICODE = 256;
@@ -45,8 +45,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
 +    const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
  
      private $path;
-     private $rfs;
-@@ -173,7 +173,7 @@ class JsonFile
+     private $httpDownloader;
+@@ -179,7 +179,7 @@ class JsonFile
          }
  
          if (null === $schemaFile) {
@@ -56,9 +56,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2020-02-14 15:37:41.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2020-02-14 15:37:43.336528140 +0100
-@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2020-10-25 06:23:06.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2020-10-25 06:23:12.863707931 +0100
+@@ -113,7 +113,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
          $validator = new Validator();
@@ -68,3 +68,41 @@ diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/
  
          if (!$validator->isValid()) {
              $errors = $validator->getErrors();
+diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php
+--- ./tests/Composer/Test/PolyfillTestCase.php.rpm	2020-10-25 06:23:06.000000000 +0100
++++ ./tests/Composer/Test/PolyfillTestCase.php	2020-10-25 06:23:12.863707931 +0100
+@@ -18,8 +18,33 @@ namespace Composer\Test {
+     use PHPUnit\Framework\Constraint\StringContains;
+     use PHPUnit\Framework\Constraint\TraversableContains;
+ 
+-    if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) {
++    if (method_exists('PHPUnit\Framework\TestCase', 'assertFileDoesNotExist')) {
+         abstract class PolyfillTestCase extends TestCase {}
++    } else if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) {
++        abstract class PolyfillTestCase extends TestCase {
++            /**
++             * @param string $filename
++             * @param string $message
++             *
++             * @return void
++             */
++            public static function assertFileDoesNotExist($filename, $message = '')
++            {
++                static::assertFileNotExists($filename, $message);
++            }
++
++            /**
++             * @param string $pattern
++             * @param string $string
++             * @param string $message
++             *
++             * @return void
++             */
++            public static function assertMatchesRegularExpression($pattern, $string, $message = '')
++            {
++                static::assertRegExp($pattern, $string, $message);
++            }
++        }
+     } else {
+         abstract class PolyfillTestCase extends TestCase
+         {
diff --git a/composer.spec b/composer.spec
index 638d41d..2f8ecca 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,36 +10,33 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%bcond_without       tests
-
-%global gh_commit    547c9ee73fe26c77af09a0ea16419176b1cdbd12
+%global gh_commit    74e8c71026edba786290047199619ac6b6490094
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_branch    1.0-dev
+%global gh_branch    2.0-dev
 %global gh_owner     composer
 %global gh_project   composer
-%global api_version  1.1.0
-%global run_version  1.0.0
+%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+%global api_version  2.0.0
+%global run_version  2.0.0
 
-%global upstream_version 1.10.15
-#global upstream_prever  RC
+%global upstream_version 2.0.2
+#global upstream_prever  RC2
+#global upstream_lower   rc2
 
-%if 0
-# see https://forum.remirepo.net/viewtopic.php?id=3677
-%global symfony_prefix php-symfony3
-%else
 %global symfony_prefix php-symfony
-%endif
+%global symfony_path   %{_datadir}/php/Symfony
+%global symfony_min    2.8
+
+%global _phpunit       %{_bindir}/phpunit
 
 Name:           composer
-Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
 URL:            https://getcomposer.org/
 Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
-Source1:        %{name}-autoload.php
-Source2:        %{name}-bootstrap.php
 # Profile scripts
 Source3:        %{name}.sh
 Source4:        %{name}.csh
@@ -51,80 +48,85 @@ Patch0:         %{name}-rpm.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
-%if %{with tests}
+%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/semver)           >= 1.0    with  php-composer(composer/semver)           <  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)
 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(justinrainbow/json-schema) >= 5.2.10 with  php-composer(justinrainbow/json-schema) <  6)
+BuildRequires:  (php-composer(react/promise)             >= 2.7    with  php-composer(react/promise)             <  3)
 %else
 BuildRequires:  php-composer-ca-bundle
-BuildRequires:  php-composer-semver
+BuildRequires:  php-composer-semver3
 BuildRequires:  php-composer-spdx-licenses               >= 1.2
 BuildRequires:  php-composer-xdebug-handler              >= 1.1
 BuildRequires:  php-jsonlint                             >= 1.4
 BuildRequires:  php-seld-phar-utils
 BuildRequires:  php-PsrLog
 BuildRequires:  php-justinrainbow-json-schema5           >= 5.2.10
+BuildRequires:  php-react-promise                        >= 2.7
 %endif
-BuildRequires:  %{symfony_prefix}-console
-BuildRequires:  %{symfony_prefix}-finder
-BuildRequires:  %{symfony_prefix}-filesystem
-BuildRequires:  %{symfony_prefix}-process
+BuildRequires:  %{symfony_prefix}-console    >= %{symfony_min}
+BuildRequires:  %{symfony_prefix}-finder     >= %{symfony_min}
+BuildRequires:  %{symfony_prefix}-filesystem >= %{symfony_min}
+BuildRequires:  %{symfony_prefix}-process    >= %{symfony_min}
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
-#        "symfony/phpunit-bridge": "^4.2",
+#        "symfony/phpunit-bridge": "^4.2 || ^5.0",
 #        "phpspec/prophecy": "^1.10"
-BuildRequires:  phpunit
+BuildRequires:  %{_phpunit}
 # For autoloader
-BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
-BuildRequires:  php-seld-phar-utils >= 1.0.1
-BuildRequires:  php-PsrLog          >= 1.0.0-8
+BuildRequires:  php-fedora-autoloader-devel
+BuildRequires:  php-seld-phar-utils >= 1.1
+BuildRequires:  php-PsrLog          >= 1.1
 %endif
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0",
 #        "composer/ca-bundle": "^1.0",
-#        "composer/semver": "^1.0",
+#        "composer/semver": "^3.0",
 #        "composer/spdx-licenses": "^1.2",
 #        "composer/xdebug-handler": "^1.1",
 #        "justinrainbow/json-schema": "^5.2.10",
 #        "psr/log": "^1.0"
 #        "seld/jsonlint": "~1.4",
 #        "seld/phar-utils": "^1.0",
-#        "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0",
-#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0",
-#        "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0",
-#        "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.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",
+#        "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
+#        "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
+#        "react/promise": "^1.2 || ^2.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/semver)           >= 1.0    with  php-composer(composer/semver)           <  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)
 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(justinrainbow/json-schema) >= 5.2.10 with  php-composer(justinrainbow/json-schema) <  6)
+Requires:       (php-composer(react/promise)             >= 2.7    with  php-composer(react/promise)             <  3)
 %else
 Requires:       php-composer-ca-bundle
-Requires:       php-composer-semver
+Requires:       php-composer-semver3
 Requires:       php-composer-spdx-licenses               >= 1.2
 Requires:       php-composer-xdebug-handler              >= 1.1
 Requires:       php-jsonlint                             >= 1.4
 Requires:       php-seld-phar-utils
 Requires:       php-PsrLog
 Requires:       php-justinrainbow-json-schema5           >= 5.2.10
+Requires:       php-react-promise                        >= 2.7
 %endif
-Requires:       %{symfony_prefix}-console
-Requires:       %{symfony_prefix}-finder
-Requires:       %{symfony_prefix}-process
-Requires:       %{symfony_prefix}-filesystem
+Requires:       %{symfony_prefix}-console    >= %{symfony_min}
+Requires:       %{symfony_prefix}-finder     >= %{symfony_min}
+Requires:       %{symfony_prefix}-process    >= %{symfony_min}
+Requires:       %{symfony_prefix}-filesystem >= %{symfony_min}
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives",
@@ -134,12 +136,12 @@ Requires:       php-zip
 Requires:       php-zlib
 # For our autoloader
 Requires:       php-composer(fedora/autoloader)
-Requires:       php-seld-phar-utils >= 1.0.1
-Requires:       php-PsrLog          >= 1.0.0-8
-# From phpcompatinfo
+Requires:       php-seld-phar-utils >= 1.1
+Requires:       php-PsrLog          >= 1.1
+# From phpcompatinfo for version 2.0.0
+Requires:       php-ctype
 Requires:       php-curl
 Requires:       php-date
-Requires:       php-dom
 Requires:       php-filter
 Requires:       php-hash
 Requires:       php-iconv
@@ -147,10 +149,11 @@ Requires:       php-intl
 Requires:       php-json
 Requires:       php-libxml
 Requires:       php-mbstring
+Requires:       php-pcntl
 Requires:       php-pcre
 Requires:       php-phar
+Requires:       php-posix
 Requires:       php-reflection
-Requires:       php-simplexml
 Requires:       php-spl
 Requires:       php-tokenizer
 Requires:       php-xsl
@@ -181,10 +184,35 @@ if grep -r '\.\./res'; then
 	exit 1
 fi
 
-cp -p %{SOURCE1} src/Composer/autoload.php
-cp -p %{SOURCE2} tests/bootstrap.php
+phpab --template fedora --output src/Composer/autoload.php src/Composer
+cat << 'EOF' | tee -a src/Composer/autoload.php
+
+\Fedora\Autoloader\Dependencies::required([
+    '%{symfony_path}/Component/Console/autoload.php',
+    '%{symfony_path}/Component/Finder/autoload.php',
+    '%{symfony_path}/Component/Process/autoload.php',
+    '%{symfony_path}/Component/Filesystem/autoload.php',
+    '%{_datadir}/php/Seld/JsonLint/autoload.php',
+    '%{_datadir}/php/Seld/PharUtils/autoload.php',
+    '%{_datadir}/php/Composer/CaBundle/autoload.php',
+    '%{_datadir}/php/Composer/Spdx/autoload.php',
+    '%{_datadir}/php/Composer/Semver3/autoload.php',
+    '%{_datadir}/php/Composer/XdebugHandler/autoload.php',
+    '%{_datadir}/php/Psr/Log/autoload.php',
+    '%{_datadir}/php/JsonSchema5/autoload.php',
+    '%{_datadir}/php/React/Promise/autoload.php',
+]);
+EOF
+
+cat << 'EOF' | tee tests/bootstrap.php
+<?php
+require 'Composer/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/');
+EOF
+
 rm src/bootstrap.php
 
+
 : fix reported version
 %if 0%{?gh_date}
 DATE=%{gh_date}
@@ -207,7 +235,7 @@ if (version_compare(Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}"
   exit(1);
 }
 if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) {
-  printf("Plugin API version is %s, expected %s\n", Composer::RUNTIME_API_VERSION, "%{run_version}");
+  printf("Runtime API version is %s, expected %s\n", Composer::RUNTIME_API_VERSION, "%{run_version}");
   exit(1);
 }'
 
@@ -237,7 +265,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %check
-%if %{with tests}
+%if %{with_tests}
 : Online tests
 rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
@@ -251,7 +279,7 @@ export BUILDROOT=%{buildroot}
 ret=0
 for cmd in php php72 php73 php74; do
   if which $cmd; then
-    $cmd -d memory_limit=1G %{_bindir}/phpunit \
+    $cmd -d memory_limit=1G %{_phpunit} \
       --filter '^((?!(testIntegration)).)*$' \
       --include-path %{buildroot}%{_datadir}/php  || ret=1
   fi
@@ -274,6 +302,11 @@ exit $ret
 
 
 %changelog
+* Mon Oct 26 2020 Remi Collet <remi@remirepo.net> - 2.0.2-1
+- update to 2.0.2
+- raise dependency on composer/semver 3
+- add dependency on react/promise 2.7
+
 * Tue Oct 13 2020 Remi Collet <remi@remirepo.net> - 1.10.15-1
 - update to 1.10.15
 
diff --git a/sources b/sources
index 503aa56..54b6b85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.15-547c9ee.tgz) = 0e70f80775ec0136bacef5da353efbbc9786e4eb33b8e209c9b3350a3dbe8d65784ac3e920cc2b605f08e03d5dbe9c823505750ed9c04fcbfc85b438b800c66c
+SHA512 (composer-2.0.2-74e8c71.tgz) = 53783ffb741552f75e53e704b3b5c325807b337a4eb34ea111b8b2375cef095bfe71d2c48315cce7b8d6c844527a9ddc5b47b5dac5bf916203669db04f3d176d

From 8804af367112c0160c294b6e8c32d482d9037397 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 29 Oct 2020 07:46:09 +0100
Subject: [PATCH 153/269] v2.0.3

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 2f8ecca..dc11ffb 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    74e8c71026edba786290047199619ac6b6490094
+%global gh_commit    f7eebdd092873f5d63929f21183e69ec9f5e83cd
 %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.2
+%global upstream_version 2.0.3
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -302,6 +302,9 @@ exit $ret
 
 
 %changelog
+* Thu Oct 29 2020 Remi Collet <remi@remirepo.net> - 2.0.3-1
+- update to 2.0.3
+
 * Mon Oct 26 2020 Remi Collet <remi@remirepo.net> - 2.0.2-1
 - update to 2.0.2
 - raise dependency on composer/semver 3
diff --git a/sources b/sources
index 54b6b85..c904ace 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.2-74e8c71.tgz) = 53783ffb741552f75e53e704b3b5c325807b337a4eb34ea111b8b2375cef095bfe71d2c48315cce7b8d6c844527a9ddc5b47b5dac5bf916203669db04f3d176d
+SHA512 (composer-2.0.3-f7eebdd.tgz) = 2dc3741196efe6d42631b21ce7d6ce868f988e855c11bfc4eb2b49d3962cc61bd2c0e5281f259413cee4c27ecbe5415f11b2896c4a31b065d8c0423c903b7f60

From 05baee618ed782ca1d32a5dec82f0d9b28e48c3f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 2 Nov 2020 07:43:33 +0100
Subject: [PATCH 154/269] v2.0.4

---
 composer.spec | 15 ++++++++++++---
 sources       |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index dc11ffb..0eb0476 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    f7eebdd092873f5d63929f21183e69ec9f5e83cd
+%global gh_commit    4053eab90a7cdf0b81dd93073dc6c18c15d487fd
 %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.3
+%global upstream_version 2.0.4
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -275,12 +275,18 @@ rm -rf res
 : Run test suite
 export BUILDROOT=%{buildroot}
 
+%if 0%{?rhel} == 6
+FILTER="--filter '^((?!(testIntegration|testArchiveCustomFileName|testArchiveTar)).)*$'"
+%else
+FILTER="--filter '^((?!(testIntegration)).)*$'"
+%endif
+
 # testIntegration may hang on local build
 ret=0
 for cmd in php php72 php73 php74; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_phpunit} \
-      --filter '^((?!(testIntegration)).)*$' \
+      $FILTER \
       --include-path %{buildroot}%{_datadir}/php  || ret=1
   fi
 done
@@ -302,6 +308,9 @@ exit $ret
 
 
 %changelog
+* Sat Oct 31 2020 Remi Collet <remi@remirepo.net> - 2.0.4-1
+- update to 2.0.4
+
 * Thu Oct 29 2020 Remi Collet <remi@remirepo.net> - 2.0.3-1
 - update to 2.0.3
 
diff --git a/sources b/sources
index c904ace..d81e8c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.3-f7eebdd.tgz) = 2dc3741196efe6d42631b21ce7d6ce868f988e855c11bfc4eb2b49d3962cc61bd2c0e5281f259413cee4c27ecbe5415f11b2896c4a31b065d8c0423c903b7f60
+SHA512 (composer-2.0.4-4053eab.tgz) = d1487d660bc1c2e780a0ee0cee75fbafc4ffd3e48d9ba182f3f8551a0b95f4ef650dac4860945e9887a72f509c926177e38cb1c9e18e3b000d725d93709a40c9

From bd46b118a676766a9ffd7b1d4ca0643486a6123c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 2 Nov 2020 07:46:46 +0100
Subject: [PATCH 155/269] v1.10.17

(cherry picked from commit ba1a04d525c90e94fc4800c399c66f5910dcd8c6)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 4fde968..b01987d 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    217f0272673c72087862c40cf91ac07eb438d778
+%global gh_commit    09d42e18394d8594be24e37923031c4b7442a1cb
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.16
+%global upstream_version 1.10.17
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Mon Nov  2 2020 Remi Collet <remi@remirepo.net> - 1.10.17-1
+- update to 1.10.17
+
 * Sun Oct 25 2020 Remi Collet <remi@remirepo.net> - 1.10.16-1
 - update to 1.10.16
 
diff --git a/sources b/sources
index 590f23b..14fffcc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.16-217f027.tgz) = 2bb7818cb64863111982e6051701a5be74140590568a452330720783336bbd721318ea270c354a22a4c25b15a65e9c6f3a5c7ff1c89e272ed0cb33ec402ce85a
+SHA512 (composer-1.10.17-09d42e1.tgz) = db18e5c4623ed6be0f35b2d4dddddec5df6c1414c6a98b45a5b65f4bbfc7b74feb05cc2f4ecfd14ca2c17cc4988f5696672ed434f7fb2e2607c9c047c27c49c0

From 179903c885108f492ab6d1bbaf53f045ed6b50d6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 9 Nov 2020 08:27:25 +0100
Subject: [PATCH 156/269] v2.0.6

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 0eb0476..e814be4 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    4053eab90a7cdf0b81dd93073dc6c18c15d487fd
+%global gh_commit    d5789bd8e2d852a6b98fe944ca2ff82e921eb43d
 %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.4
+%global upstream_version 2.0.6
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -308,6 +308,9 @@ exit $ret
 
 
 %changelog
+* Sun Nov  8 2020 Remi Collet <remi@remirepo.net> - 2.0.6-1
+- update to 2.0.6
+
 * Sat Oct 31 2020 Remi Collet <remi@remirepo.net> - 2.0.4-1
 - update to 2.0.4
 
diff --git a/sources b/sources
index d81e8c0..6406e01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.4-4053eab.tgz) = d1487d660bc1c2e780a0ee0cee75fbafc4ffd3e48d9ba182f3f8551a0b95f4ef650dac4860945e9887a72f509c926177e38cb1c9e18e3b000d725d93709a40c9
+SHA512 (composer-2.0.6-d5789bd.tgz) = ac3f983fabb6fcbc2c653edde0dfaa3573af86060ab44208c3e05f02fa7f17a0d0a2ff0064cc5e4b4ec298aa30f79b4ac621aec9adcaff77b63e95f145c6439c

From 12865640f67c8654c2b16db6c6dc0989e6a52b65 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 16 Nov 2020 08:55:50 +0100
Subject: [PATCH 157/269] v2.0.7

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index e814be4..95fa6bf 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    d5789bd8e2d852a6b98fe944ca2ff82e921eb43d
+%global gh_commit    cbee637510037f293e641857b2a6223d0ea8008d
 %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.6
+%global upstream_version 2.0.7
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -308,6 +308,9 @@ exit $ret
 
 
 %changelog
+* Sat Nov 14 2020 Remi Collet <remi@remirepo.net> - 2.0.7-1
+- update to 2.0.7
+
 * Sun Nov  8 2020 Remi Collet <remi@remirepo.net> - 2.0.6-1
 - update to 2.0.6
 
diff --git a/sources b/sources
index 6406e01..530fdb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.6-d5789bd.tgz) = ac3f983fabb6fcbc2c653edde0dfaa3573af86060ab44208c3e05f02fa7f17a0d0a2ff0064cc5e4b4ec298aa30f79b4ac621aec9adcaff77b63e95f145c6439c
+SHA512 (composer-2.0.7-cbee637.tgz) = 7a94f359745eb0c112383064c23ffc1f88a4b8a6fcea38881b5b8955c670de51777fb3cebfff6b6cb279eb6ef1b7b412727ea23f298e729f25064d5b7e3747f9

From cecf2ccf16fed497c97d29bbd85146d193707695 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Dec 2020 11:36:03 +0100
Subject: [PATCH 158/269] v2.0.8

---
 composer-rpm.patch | 36 +++++++++++++++++++-----------------
 composer.spec      |  7 +++++--
 sources            |  2 +-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index f027f60..130d62d 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2020-10-25 06:23:06.000000000 +0100
-+++ ./bin/composer	2020-10-25 06:23:12.862707931 +0100
+--- ./bin/composer.rpm	2020-12-04 08:01:03.000000000 +0100
++++ ./bin/composer	2020-12-04 08:07:35.946138601 +0100
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2020-10-25 06:23:06.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2020-10-25 06:23:12.863707931 +0100
-@@ -364,7 +364,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2020-12-04 08:01:03.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2020-12-04 08:07:35.946138601 +0100
+@@ -373,7 +373,7 @@ EOF;
          $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform));
  
          $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,9 +23,9 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2020-10-25 06:23:12.863707931 +0100
-+++ ./src/Composer/Compiler.php	2020-10-25 06:26:14.912591239 +0100
-@@ -99,7 +99,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm	2020-12-04 08:01:03.000000000 +0100
++++ ./src/Composer/Compiler.php	2020-12-04 08:07:35.946138601 +0100
+@@ -98,7 +98,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2020-10-25 06:23:06.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2020-10-25 06:23:12.863707931 +0100
+--- ./src/Composer/Json/JsonFile.php.rpm	2020-12-04 08:01:03.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2020-12-04 08:07:35.946138601 +0100
 @@ -34,7 +34,7 @@ class JsonFile
      const JSON_PRETTY_PRINT = 128;
      const JSON_UNESCAPED_UNICODE = 256;
@@ -56,8 +56,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2020-10-25 06:23:06.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2020-10-25 06:23:12.863707931 +0100
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2020-12-04 08:01:03.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2020-12-04 08:07:35.947138597 +0100
 @@ -113,7 +113,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
@@ -69,15 +69,17 @@ diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/
          if (!$validator->isValid()) {
              $errors = $validator->getErrors();
 diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php
---- ./tests/Composer/Test/PolyfillTestCase.php.rpm	2020-10-25 06:23:06.000000000 +0100
-+++ ./tests/Composer/Test/PolyfillTestCase.php	2020-10-25 06:23:12.863707931 +0100
-@@ -18,8 +18,33 @@ namespace Composer\Test {
+--- ./tests/Composer/Test/PolyfillTestCase.php.rpm	2020-12-04 08:07:35.947138597 +0100
++++ ./tests/Composer/Test/PolyfillTestCase.php	2020-12-04 08:09:14.344707638 +0100
+@@ -15,10 +15,35 @@ namespace Composer\Test {
+     use PHPUnit\Framework\Constraint\LogicalNot;
      use PHPUnit\Framework\Constraint\StringContains;
-     use PHPUnit\Framework\Constraint\TraversableContains;
  
 -    if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) {
 +    if (method_exists('PHPUnit\Framework\TestCase', 'assertFileDoesNotExist')) {
-         abstract class PolyfillTestCase extends TestCase {}
+         abstract class PolyfillTestCase extends TestCase
+         {
+         }
 +    } else if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) {
 +        abstract class PolyfillTestCase extends TestCase {
 +            /**
diff --git a/composer.spec b/composer.spec
index 95fa6bf..1b18982 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    cbee637510037f293e641857b2a6223d0ea8008d
+%global gh_commit    62139b2806178adb979d76bd3437534a1a9fd490
 %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.7
+%global upstream_version 2.0.8
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -308,6 +308,9 @@ exit $ret
 
 
 %changelog
+* Fri Dec  4 2020 Remi Collet <remi@remirepo.net> - 2.0.8-1
+- update to 2.0.8
+
 * Sat Nov 14 2020 Remi Collet <remi@remirepo.net> - 2.0.7-1
 - update to 2.0.7
 
diff --git a/sources b/sources
index 530fdb9..16a0a5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.7-cbee637.tgz) = 7a94f359745eb0c112383064c23ffc1f88a4b8a6fcea38881b5b8955c670de51777fb3cebfff6b6cb279eb6ef1b7b412727ea23f298e729f25064d5b7e3747f9
+SHA512 (composer-2.0.8-62139b2.tgz) = 852ff831849c7fe230feadfe4a2b516662d9cd339d885f0ec2a0e2e31ab51c22105deaf6e3fc2d04b97aca4a91b67def8f8ad047636321662963f0fbd2d845ca

From 1592eb053b89c1067c82a5aaa676a8cfd409ed9f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Dec 2020 11:38:04 +0100
Subject: [PATCH 159/269] v1.10.19

(cherry picked from commit 13953f20f854144a1bee2073be69166913e16ef6)
---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index b01987d..b26b681 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    09d42e18394d8594be24e37923031c4b7442a1cb
+%global gh_commit    196601d50c08c3fae389a417a7689367fcf37cef
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.17
+%global upstream_version 1.10.19
 #global upstream_prever  RC
 
 %if 0
@@ -87,7 +87,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 %endif
 
 # From composer.json, "require": {
-#        "php": "^5.3.2 || ^7.0",
+#        "php": "^5.3.2 || ^7.0 || ^8.0",
 #        "composer/ca-bundle": "^1.0",
 #        "composer/semver": "^1.0",
 #        "composer/spdx-licenses": "^1.2",
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Sat Dec  5 2020 Remi Collet <remi@remirepo.net> - 1.10.19-1
+- update to 1.10.19
+
 * Mon Nov  2 2020 Remi Collet <remi@remirepo.net> - 1.10.17-1
 - update to 1.10.17
 
diff --git a/sources b/sources
index 14fffcc..2969c8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.17-09d42e1.tgz) = db18e5c4623ed6be0f35b2d4dddddec5df6c1414c6a98b45a5b65f4bbfc7b74feb05cc2f4ecfd14ca2c17cc4988f5696672ed434f7fb2e2607c9c047c27c49c0
+SHA512 (composer-1.10.19-196601d.tgz) = c91c0b7322b80a545bd940c88168a9457cc787c2c6deae428adc61389f89ad010b6cee2cde4692b1682fe5a210b4b952e1bdc47c7bfd0e4438e2f2247b013528

From 9523edb2d5c816bc4bbff60e4b7a055a64d775e2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 02:26:09 +0000
Subject: [PATCH 160/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 1b18982..42bdc87 100644
--- a/composer.spec
+++ b/composer.spec
@@ -31,7 +31,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -308,6 +308,9 @@ exit $ret
 
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Fri Dec  4 2020 Remi Collet <remi@remirepo.net> - 2.0.8-1
 - update to 2.0.8
 

From 5160ff7691b05bce79b08ce02a9e7c7480be0a3d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 28 Jan 2021 08:02:25 +0100
Subject: [PATCH 161/269] v1.0.20

(cherry picked from commit 0c43b97372fc40315db6634cd7bec189770b4342)
---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index b26b681..924bb5a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2020 Remi Collet
+# Copyright (c) 2015-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    196601d50c08c3fae389a417a7689367fcf37cef
+%global gh_commit    e55d297525f0ecc805c813a0f63a40114fd670f6
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.19
+%global upstream_version 1.10.20
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Thu Jan 28 2021 Remi Collet <remi@remirepo.net> - 1.10.20-1
+- update to 1.10.20
+
 * Sat Dec  5 2020 Remi Collet <remi@remirepo.net> - 1.10.19-1
 - update to 1.10.19
 
diff --git a/sources b/sources
index 2969c8e..2e9a6bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.19-196601d.tgz) = c91c0b7322b80a545bd940c88168a9457cc787c2c6deae428adc61389f89ad010b6cee2cde4692b1682fe5a210b4b952e1bdc47c7bfd0e4438e2f2247b013528
+SHA512 (composer-1.10.20-e55d297.tgz) = 63fe1befac0ea567f3d206383e76e641a732d76068be291a65614290872984ab2954946d1b6a72585681a5b52aeffe41f9b7d0021f082cc07365edaecbedd734

From 2227dad08d37ddd58edd41a5b119e31e7c86d422 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 28 Jan 2021 08:17:24 +0100
Subject: [PATCH 162/269] update to 2.0.9 switch to Symfony 4 switch to
 phpunit9

---
 composer.spec | 38 ++++++++++++++++++++++++--------------
 sources       |  2 +-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/composer.spec b/composer.spec
index 42bdc87..dde042d 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2020 Remi Collet
+# Copyright (c) 2015-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    62139b2806178adb979d76bd3437534a1a9fd490
+%global gh_commit    591c2c155cac0d2d7f34af41d3b1e29bcbfc685e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -19,19 +19,19 @@
 %global api_version  2.0.0
 %global run_version  2.0.0
 
-%global upstream_version 2.0.8
+%global upstream_version 2.0.9
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
-%global symfony_prefix php-symfony
-%global symfony_path   %{_datadir}/php/Symfony
-%global symfony_min    2.8
+%global symfony_prefix php-symfony4
+%global symfony_path   %{_datadir}/php/Symfony4
+%global symfony_min    4.4
 
-%global _phpunit       %{_bindir}/phpunit
+%global _phpunit       %{_bindir}/phpunit9
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -177,7 +177,7 @@ Documentation: https://getcomposer.org/doc/
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p1 -b .rpm
-find . -name \*.rpm -exec rm {} \; -print
+find . -name \*.rpm -delete -print
 
 if grep -r '\.\./res'; then
 	: Patch need to fixed
@@ -275,15 +275,20 @@ rm -rf res
 : Run test suite
 export BUILDROOT=%{buildroot}
 
-%if 0%{?rhel} == 6
-FILTER="--filter '^((?!(testIntegration|testArchiveCustomFileName|testArchiveTar)).)*$'"
-%else
 FILTER="--filter '^((?!(testIntegration)).)*$'"
-%endif
+
+# Adapt for phunit9
+find tests \
+  -name \*.php \
+  -exec sed -e '/function setUpBeforeClass(/s/$/:void/' \
+            -e '/function tearDownAfterClass(/s/$/:void/' \
+            -e '/function setUp(/s/$/:void/' \
+            -e '/function tearDown(/s/$/:void/' \
+            -i {} \;
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php72 php73 php74; do
+for cmd in php php73 php74 php80; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_phpunit} \
       $FILTER \
@@ -308,6 +313,11 @@ exit $ret
 
 
 %changelog
+* Thu Jan 28 2021 Remi Collet <remi@remirepo.net> - 2.0.9-1
+- update to 2.0.9
+- switch to Symfony 4
+- switch to phpunit9
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 16a0a5d..4a6ff5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.8-62139b2.tgz) = 852ff831849c7fe230feadfe4a2b516662d9cd339d885f0ec2a0e2e31ab51c22105deaf6e3fc2d04b97aca4a91b67def8f8ad047636321662963f0fbd2d845ca
+SHA512 (composer-2.0.9-591c2c1.tgz) = 130ae4e05a257b9e97516d144dee21a960b85163ee8f9ae609260e9cbb77db6b31325db2ba8db4e76034333e6e0d97e0360ce74e9fe4a8fa258c7988027c9433

From 86efe6bd126511b01502cb106cf861ca61ff8c08 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 24 Feb 2021 07:54:42 +0100
Subject: [PATCH 163/269] v2.0.10

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index dde042d..30576e8 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    591c2c155cac0d2d7f34af41d3b1e29bcbfc685e
+%global gh_commit    890c79ff096818e762b42c9624ca1df800ab789b
 %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.9
+%global upstream_version 2.0.10
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -313,6 +313,9 @@ exit $ret
 
 
 %changelog
+* Tue Feb 23 2021 Remi Collet <remi@remirepo.net> - 2.0.10-1
+- update to 2.0.10
+
 * Thu Jan 28 2021 Remi Collet <remi@remirepo.net> - 2.0.9-1
 - update to 2.0.9
 - switch to Symfony 4
diff --git a/sources b/sources
index 4a6ff5f..1118235 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.9-591c2c1.tgz) = 130ae4e05a257b9e97516d144dee21a960b85163ee8f9ae609260e9cbb77db6b31325db2ba8db4e76034333e6e0d97e0360ce74e9fe4a8fa258c7988027c9433
+SHA512 (composer-2.0.10-890c79f.tgz) = 8d2c6cefe33e33673aded1c0150a3adbb1bf0350f1886281bd09a7f08321555aa07cfb9b43ea5baf2e3475e4e0034fa727f94fd2f458faeaf3a1f6f9fb8a1d1d

From 7b8fbe3cc054c23f8fdff596f815614a5c18d82f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 25 Feb 2021 06:26:17 +0100
Subject: [PATCH 164/269] v2.0.11

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 30576e8..4d960c1 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    890c79ff096818e762b42c9624ca1df800ab789b
+%global gh_commit    a5a5632da0b1c2d6fa9a3b65f1f4e90d1f04abb9
 %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.10
+%global upstream_version 2.0.11
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -313,6 +313,9 @@ exit $ret
 
 
 %changelog
+* Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 2.0.11-1
+- update to 2.0.11
+
 * Tue Feb 23 2021 Remi Collet <remi@remirepo.net> - 2.0.10-1
 - update to 2.0.10
 
diff --git a/sources b/sources
index 1118235..750d5a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.10-890c79f.tgz) = 8d2c6cefe33e33673aded1c0150a3adbb1bf0350f1886281bd09a7f08321555aa07cfb9b43ea5baf2e3475e4e0034fa727f94fd2f458faeaf3a1f6f9fb8a1d1d
+SHA512 (composer-2.0.11-a5a5632.tgz) = a1b9a2011134f0755b767f069e64e977ebe940242f4d66cfe0572ddf8160d6e600e3398acf996dbd167493e0639d80f18e4b41d4a67416d64560bb3d1343ef86

From f7c02b1a6567ccf164809336e1e33bf4a040a8aa Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 1 Apr 2021 13:30:51 +0200
Subject: [PATCH 165/269] v1.10.21

(cherry picked from commit aa502ea77554940d01b560c1de7e151901fabd3a)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 924bb5a..173902f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    e55d297525f0ecc805c813a0f63a40114fd670f6
+%global gh_commit    04021432f4a9cbd9351dd166b8c193f42c36a39c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.20
+%global upstream_version 1.10.21
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Thu Apr  1 2021 Remi Collet <remi@remirepo.net> - 1.10.21-1
+- update to 1.10.21
+
 * Thu Jan 28 2021 Remi Collet <remi@remirepo.net> - 1.10.20-1
 - update to 1.10.20
 
diff --git a/sources b/sources
index 2e9a6bc..8e0159b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.20-e55d297.tgz) = 63fe1befac0ea567f3d206383e76e641a732d76068be291a65614290872984ab2954946d1b6a72585681a5b52aeffe41f9b7d0021f082cc07365edaecbedd734
+SHA512 (composer-1.10.21-0402143.tgz) = b91f17d35765366af44ddc8b9e6ecf1fa57f245ae9f8b27838b7fc677581df3c27e8dd9a158bcebd2c90e04074fd61a091873add99994148a79d1e9652bdf981

From eb76f9d9f1eab1d00f7f31f59724b65c041e3a4e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 1 Apr 2021 13:42:58 +0200
Subject: [PATCH 166/269] v2.0.12

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 4d960c1..02793c1 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    a5a5632da0b1c2d6fa9a3b65f1f4e90d1f04abb9
+%global gh_commit    6c12ce263da71641903e399c3ce8ecb08fd375fb
 %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.11
+%global upstream_version 2.0.12
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -313,6 +313,9 @@ exit $ret
 
 
 %changelog
+* Thu Apr  1 2021 Remi Collet <remi@remirepo.net> - 2.0.12-1
+- update to 2.0.12
+
 * Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 2.0.11-1
 - update to 2.0.11
 
diff --git a/sources b/sources
index 750d5a4..7da8768 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.11-a5a5632.tgz) = a1b9a2011134f0755b767f069e64e977ebe940242f4d66cfe0572ddf8160d6e600e3398acf996dbd167493e0639d80f18e4b41d4a67416d64560bb3d1343ef86
+SHA512 (composer-2.0.12-6c12ce2.tgz) = 9a57258d3cd6fdd392d2d3f6f373eccc91bc744460754bbb1e12c15c3939b6a7114c70b4bf7583829a4b853e201d8405dcc51af77af71d37ade36c1cd020d286

From 3bbeab79bc530df54039369fe1078c308da65327 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 17 May 2021 08:15:00 +0200
Subject: [PATCH 167/269] v1.10.22

(cherry picked from commit 1fc58abcca79f567c385dd60f952e19c3781682c)
---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 173902f..ed5239b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    04021432f4a9cbd9351dd166b8c193f42c36a39c
+%global gh_commit    28c9dfbe2351635961f670773e8d7b17bc5eda25
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.21
+%global upstream_version 1.10.22
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Tue Apr 27 2021 Remi Collet <remi@remirepo.net> - 1.10.22-1
+- update to 1.10.22
+
 * Thu Apr  1 2021 Remi Collet <remi@remirepo.net> - 1.10.21-1
 - update to 1.10.21
 
diff --git a/sources b/sources
index 8e0159b..c51b7a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.21-0402143.tgz) = b91f17d35765366af44ddc8b9e6ecf1fa57f245ae9f8b27838b7fc677581df3c27e8dd9a158bcebd2c90e04074fd61a091873add99994148a79d1e9652bdf981
+SHA512 (composer-1.10.22-28c9dfb.tgz) = a5508789019530f6f9e6207bad005e37f35923b7286c655fdc1fe485e01a26ce4018f84c803a40b6b1b52c93fd394d61192a75febef7d6756df102d4dc2139ee

From eff6dc02da4d794dacada47cfd0e485e58b6886b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 17 May 2021 08:24:24 +0200
Subject: [PATCH 168/269] update to 2.0.13 add dependency on
 composer/metadata-minifier

---
 composer.spec | 14 ++++++++++++--
 sources       |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 02793c1..ea4a5ff 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
 
@@ -51,6 +51,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)
@@ -61,6 +62,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
@@ -88,6 +90,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",
@@ -104,6 +107,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)
@@ -114,6 +118,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
@@ -196,6 +201,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',
@@ -313,6 +319,10 @@ exit $ret
 
 
 %changelog
+* Tue Apr 27 2021 Remi Collet <remi@remirepo.net> - 2.0.13-1
+- update to 2.0.13
+- add dependency on composer/metadata-minifier
+
 * Thu Apr  1 2021 Remi Collet <remi@remirepo.net> - 2.0.12-1
 - update to 2.0.12
 
diff --git a/sources b/sources
index 7da8768..6c703bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.12-6c12ce2.tgz) = 9a57258d3cd6fdd392d2d3f6f373eccc91bc744460754bbb1e12c15c3939b6a7114c70b4bf7583829a4b853e201d8405dcc51af77af71d37ade36c1cd020d286
+SHA512 (composer-2.0.13-986e8b8.tgz) = 293e9a3b1ab924e48ff66525b381df889ff7a074187aedd388058f9c6dc815257a5f1537d47818b1da19857c629f2fb6bfa4d7b20096e1c9fb65f3e0fb8b1fa4

From 9c51eff13aa9b95d55e8de533673c8ad084522f3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 25 May 2021 10:03:34 +0200
Subject: [PATCH 169/269] update to 2.0.14 switch to composer/xdebug-handler v2

---
 composer.spec | 30 +++++++++++++++++-------------
 sources       |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/composer.spec b/composer.spec
index ea4a5ff..cdc315f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    986e8b86b7b570632ad0a905c3726c33dd4c0efb
+%global gh_commit    92b2ccbef65292ba9f2004271ef47c7231e2eed5
 %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.13
+%global upstream_version 2.0.14
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -54,7 +54,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)   >= 1.1    with  php-composer(composer/xdebug-handler)   <  2)
+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)
@@ -65,7 +65,7 @@ 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
+BuildRequires:  php-composer-xdebug-handler2
 BuildRequires:  php-jsonlint                             >= 1.4
 BuildRequires:  php-seld-phar-utils
 BuildRequires:  php-PsrLog
@@ -78,7 +78,7 @@ BuildRequires:  %{symfony_prefix}-filesystem >= %{symfony_min}
 BuildRequires:  %{symfony_prefix}-process    >= %{symfony_min}
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
-#        "symfony/phpunit-bridge": "^4.2 || ^5.0",
+#        "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0",
 #        "phpspec/prophecy": "^1.10"
 BuildRequires:  %{_phpunit}
 # For autoloader
@@ -93,15 +93,15 @@ BuildRequires:  php-PsrLog          >= 1.1
 #        "composer/metadata-minifier": "^1.0",
 #        "composer/semver": "^3.0",
 #        "composer/spdx-licenses": "^1.2",
-#        "composer/xdebug-handler": "^1.1",
+#        "composer/xdebug-handler": "^2.0",
 #        "justinrainbow/json-schema": "^5.2.10",
 #        "psr/log": "^1.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",
-#        "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
-#        "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
+#        "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.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"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
@@ -110,7 +110,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)   >= 1.1    with  php-composer(composer/xdebug-handler)   <  2)
+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)
@@ -121,7 +121,7 @@ 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
+Requires:       php-composer-xdebug-handler2
 Requires:       php-jsonlint                             >= 1.4
 Requires:       php-seld-phar-utils
 Requires:       php-PsrLog
@@ -193,6 +193,7 @@ 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 */
     '%{symfony_path}/Component/Console/autoload.php',
     '%{symfony_path}/Component/Finder/autoload.php',
     '%{symfony_path}/Component/Process/autoload.php',
@@ -203,7 +204,6 @@ 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/XdebugHandler/autoload.php',
     '%{_datadir}/php/Psr/Log/autoload.php',
     '%{_datadir}/php/JsonSchema5/autoload.php',
     '%{_datadir}/php/React/Promise/autoload.php',
@@ -319,6 +319,10 @@ exit $ret
 
 
 %changelog
+* Sat May 22 2021 Remi Collet <remi@remirepo.net> - 2.0.14-1
+- update to 2.0.14
+- switch to composer/xdebug-handler v2
+
 * Tue Apr 27 2021 Remi Collet <remi@remirepo.net> - 2.0.13-1
 - update to 2.0.13
 - add dependency on composer/metadata-minifier
diff --git a/sources b/sources
index 6c703bb..c528f73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.13-986e8b8.tgz) = 293e9a3b1ab924e48ff66525b381df889ff7a074187aedd388058f9c6dc815257a5f1537d47818b1da19857c629f2fb6bfa4d7b20096e1c9fb65f3e0fb8b1fa4
+SHA512 (composer-2.0.14-92b2ccb.tgz) = 24a1cb0140220cdaf3555f47f086184cee36f89953b3494cce9d485316c41ed472221abc5aeb9ce0dde572d6d6f5e0fdf01869a76e3475810f5408a89f5f47ff

From ce36f5cbc0d66cc2df2785be25266877e097a927 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 31 May 2021 15:59:44 +0200
Subject: [PATCH 170/269] disable XDG directories usage, see #1955455

---
 composer-noxdg.patch | 14 ++++++++++++++
 composer.spec        | 10 ++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 composer-noxdg.patch

diff --git a/composer-noxdg.patch b/composer-noxdg.patch
new file mode 100644
index 0000000..fc6b127
--- /dev/null
+++ b/composer-noxdg.patch
@@ -0,0 +1,14 @@
+diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php
+--- ./src/Composer/Factory.php.noxdg	2021-05-31 15:37:50.548115679 +0200
++++ ./src/Composer/Factory.php	2021-05-31 15:39:05.192882880 +0200
+@@ -653,6 +653,10 @@ class Factory
+      */
+     private static function useXdg()
+     {
++        // As XDG is very patially implemted
++        // resulting in command/code in ~/.config
++        return false;
++
+         foreach (array_keys($_SERVER) as $key) {
+             if (strpos($key, 'XDG_') === 0) {
+                 return true;
diff --git a/composer.spec b/composer.spec
index cdc315f..eea1ed9 100644
--- a/composer.spec
+++ b/composer.spec
@@ -31,7 +31,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -45,6 +45,8 @@ Source5:        makesrc.sh
 
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
+# Disable XDG support as only partially implemented
+Patch1:         %{name}-noxdg.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
@@ -182,7 +184,8 @@ Documentation: https://getcomposer.org/doc/
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p1 -b .rpm
-find . -name \*.rpm -delete -print
+%patch1 -p1 -b .noxdg
+find . \( -name \*.rpm -o -name \*noxdg \) -delete -print
 
 if grep -r '\.\./res'; then
 	: Patch need to fixed
@@ -319,6 +322,9 @@ exit $ret
 
 
 %changelog
+* Mon May 31 2021 Remi Collet <remi@remirepo.net> - 2.0.14-2
+- disable XDG directories usage, see #1955455
+
 * Sat May 22 2021 Remi Collet <remi@remirepo.net> - 2.0.14-1
 - update to 2.0.14
 - switch to composer/xdebug-handler v2

From cd3c36fec4299be1e94ddbdfad18b2fc24b6fff4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 3 Jun 2021 14:14:39 +0200
Subject: [PATCH 171/269] v2.1.0

---
 composer.spec | 17 ++++++++++-------
 sources       |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/composer.spec b/composer.spec
index eea1ed9..6b75d39 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,18 +10,18 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    92b2ccbef65292ba9f2004271ef47c7231e2eed5
+%global gh_commit    59bb0df323c75308e6a72c6c9bc7dc8cc577f1ca
 %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 with_tests   %{?_without_tests:0}%{!?_without_tests:1}
-%global api_version  2.0.0
-%global run_version  2.0.0
+%global api_version  2.1.0
+%global run_version  2.1.0
 
-%global upstream_version 2.0.14
-#global upstream_prever  RC2
-#global upstream_lower   rc2
+%global upstream_version 2.1.0
+#global upstream_prever  RC1
+#global upstream_lower   rc1
 
 %global symfony_prefix php-symfony4
 %global symfony_path   %{_datadir}/php/Symfony4
@@ -31,7 +31,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -322,6 +322,9 @@ exit $ret
 
 
 %changelog
+* Thu Jun  3 2021 Remi Collet <remi@remirepo.net> - 2.1.0-1
+- update to 2.1.0
+
 * Mon May 31 2021 Remi Collet <remi@remirepo.net> - 2.0.14-2
 - disable XDG directories usage, see #1955455
 
diff --git a/sources b/sources
index c528f73..dc23112 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.0.14-92b2ccb.tgz) = 24a1cb0140220cdaf3555f47f086184cee36f89953b3494cce9d485316c41ed472221abc5aeb9ce0dde572d6d6f5e0fdf01869a76e3475810f5408a89f5f47ff
+SHA512 (composer-2.1.0-59bb0df.tgz) = d4c4d9fc79fe8996a3844d09ee7496d4e881328140595730aebaccf05c55dad0bc2777d18cfab20a3a3b7f6680aeaeae8350c365d6593e4eee31d4ddca4c2a8d

From 7b632dc3d9f2b8cb155bd1bed6ef2ac9d494336a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 4 Jun 2021 09:28:18 +0200
Subject: [PATCH 172/269] v2.1.1

---
 composer-rpm.patch | 36 ++++++++++++++++++------------------
 composer.spec      |  7 +++++--
 sources            |  2 +-
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 130d62d..bbf0feb 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2020-12-04 08:01:03.000000000 +0100
-+++ ./bin/composer	2020-12-04 08:07:35.946138601 +0100
+--- ./bin/composer.rpm	2021-06-04 09:21:49.000000000 +0200
++++ ./bin/composer	2021-06-04 09:21:53.808648766 +0200
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2020-12-04 08:01:03.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2020-12-04 08:07:35.946138601 +0100
-@@ -373,7 +373,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2021-06-04 09:21:49.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2021-06-04 09:21:53.808648766 +0200
+@@ -395,7 +395,7 @@ EOF;
          $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform));
  
          $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,9 +23,9 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2020-12-04 08:01:03.000000000 +0100
-+++ ./src/Composer/Compiler.php	2020-12-04 08:07:35.946138601 +0100
-@@ -98,7 +98,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm	2021-06-04 09:21:49.000000000 +0200
++++ ./src/Composer/Compiler.php	2021-06-04 09:21:53.808648766 +0200
+@@ -100,7 +100,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2020-12-04 08:01:03.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2020-12-04 08:07:35.946138601 +0100
+--- ./src/Composer/Json/JsonFile.php.rpm	2021-06-04 09:21:49.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2021-06-04 09:23:51.867361526 +0200
 @@ -34,7 +34,7 @@ class JsonFile
      const JSON_PRETTY_PRINT = 128;
      const JSON_UNESCAPED_UNICODE = 256;
@@ -46,19 +46,19 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      private $path;
      private $httpDownloader;
-@@ -179,7 +179,7 @@ class JsonFile
-         }
- 
+@@ -188,7 +188,7 @@ class JsonFile
+         $isComposerSchemaFile = false;
          if (null === $schemaFile) {
+             $isComposerSchemaFile = true;
 -            $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH;
 +            $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH;
          }
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2020-12-04 08:01:03.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2020-12-04 08:07:35.947138597 +0100
-@@ -113,7 +113,8 @@ class ComposerSchemaTest extends TestCas
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2021-06-04 09:21:49.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2021-06-04 09:21:53.808648766 +0200
+@@ -93,7 +93,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
          $validator = new Validator();
@@ -69,8 +69,8 @@ diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/
          if (!$validator->isValid()) {
              $errors = $validator->getErrors();
 diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php
---- ./tests/Composer/Test/PolyfillTestCase.php.rpm	2020-12-04 08:07:35.947138597 +0100
-+++ ./tests/Composer/Test/PolyfillTestCase.php	2020-12-04 08:09:14.344707638 +0100
+--- ./tests/Composer/Test/PolyfillTestCase.php.rpm	2021-06-04 09:21:49.000000000 +0200
++++ ./tests/Composer/Test/PolyfillTestCase.php	2021-06-04 09:21:53.808648766 +0200
 @@ -15,10 +15,35 @@ namespace Composer\Test {
      use PHPUnit\Framework\Constraint\LogicalNot;
      use PHPUnit\Framework\Constraint\StringContains;
diff --git a/composer.spec b/composer.spec
index 6b75d39..07299e1 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    59bb0df323c75308e6a72c6c9bc7dc8cc577f1ca
+%global gh_commit    e338749d4e6cc97e1136c210ce0212d4a59e3a58
 %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.1.0
 %global run_version  2.1.0
 
-%global upstream_version 2.1.0
+%global upstream_version 2.1.1
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -322,6 +322,9 @@ exit $ret
 
 
 %changelog
+* Fri Jun  4 2021 Remi Collet <remi@remirepo.net> - 2.1.1-1
+- update to 2.1.1
+
 * Thu Jun  3 2021 Remi Collet <remi@remirepo.net> - 2.1.0-1
 - update to 2.1.0
 
diff --git a/sources b/sources
index dc23112..16b1877 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.0-59bb0df.tgz) = d4c4d9fc79fe8996a3844d09ee7496d4e881328140595730aebaccf05c55dad0bc2777d18cfab20a3a3b7f6680aeaeae8350c365d6593e4eee31d4ddca4c2a8d
+SHA512 (composer-2.1.1-e338749.tgz) = ff9357bf222dc70fdd5069b9aab8c67cfb57c65d6d7606afc3796c1122051b43dadd11d85839ecff0d474de5c0530ef51a011af91c651dfe3c11a3520ff754ac

From b6110c1b547d41a2bc39488ed2146d29199c44ca Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Jun 2021 08:31:12 +0200
Subject: [PATCH 173/269] fix Composer\InstalledVersions RPM installation

---
 composer-rpm.patch | 15 +++++++++++++++
 composer.spec      |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index bbf0feb..5f05a85 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -108,3 +108,18 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po
      } else {
          abstract class PolyfillTestCase extends TestCase
          {
+--- ./src/Composer/InstalledVersions.php.rpm	2021-06-07 08:18:59.326450774 +0200
++++ ./src/Composer/InstalledVersions.php	2021-06-07 08:19:11.525413189 +0200
+@@ -315,10 +315,9 @@
+             }
+         }
+ 
+-        if (null === self::$installed) {
+-            self::$installed = require __DIR__ . '/installed.php';
++        if (null !== self::$installed) {
++            $installed[] = self::$installed;
+         }
+-        $installed[] = self::$installed;
+ 
+         return $installed;
+     }
diff --git a/composer.spec b/composer.spec
index 07299e1..e601518 100644
--- a/composer.spec
+++ b/composer.spec
@@ -31,7 +31,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -322,6 +322,9 @@ exit $ret
 
 
 %changelog
+* Mon Jun  7 2021 Remi Collet <remi@remirepo.net> - 2.1.1-2
+- fix Composer\InstalledVersions RPM installation
+
 * Fri Jun  4 2021 Remi Collet <remi@remirepo.net> - 2.1.1-1
 - update to 2.1.1
 

From bc88e9c1f5d286b9dcc0b597aa273c93ddbf8df9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Jun 2021 17:04:25 +0200
Subject: [PATCH 174/269] v2.1.2

---
 composer-rpm.patch | 32 +++++++++++++++++++-------------
 composer.spec      |  9 ++++++---
 sources            |  2 +-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 5f05a85..d63b69b 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -110,16 +110,22 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po
          {
 --- ./src/Composer/InstalledVersions.php.rpm	2021-06-07 08:18:59.326450774 +0200
 +++ ./src/Composer/InstalledVersions.php	2021-06-07 08:19:11.525413189 +0200
-@@ -315,10 +315,9 @@
-             }
-         }
- 
--        if (null === self::$installed) {
--            self::$installed = require __DIR__ . '/installed.php';
-+        if (null !== self::$installed) {
-+            $installed[] = self::$installed;
-         }
--        $installed[] = self::$installed;
- 
-         return $installed;
-     }
+@@ -251,7 +251,7 @@ class InstalledVersions
+         if (null === self::$installed) {
+             // only require the installed.php file if this file is loaded from its dumped location,
+             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+-            if (substr(__DIR__, -8, 1) !== 'C') {
++            if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
+                 self::$installed = include __DIR__ . '/installed.php';
+             } else {
+                 self::$installed = array();
+@@ -324,7 +324,7 @@ class InstalledVersions
+         if (null === self::$installed) {
+             // only require the installed.php file if this file is loaded from its dumped location,
+             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+-            if (substr(__DIR__, -8, 1) !== 'C') {
++            if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
+                 self::$installed = require __DIR__ . '/installed.php';
+             } else {
+                 self::$installed = array();
+
diff --git a/composer.spec b/composer.spec
index e601518..221d175 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    e338749d4e6cc97e1136c210ce0212d4a59e3a58
+%global gh_commit    1845e6854aa3f37f2c6c24bc525541b00b8b28e4
 %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.1.0
 %global run_version  2.1.0
 
-%global upstream_version 2.1.1
+%global upstream_version 2.1.2
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -31,7 +31,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -322,6 +322,9 @@ exit $ret
 
 
 %changelog
+* Mon Jun  7 2021 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- update to 2.1.2
+
 * Mon Jun  7 2021 Remi Collet <remi@remirepo.net> - 2.1.1-2
 - fix Composer\InstalledVersions RPM installation
 
diff --git a/sources b/sources
index 16b1877..d9bd512 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.1-e338749.tgz) = ff9357bf222dc70fdd5069b9aab8c67cfb57c65d6d7606afc3796c1122051b43dadd11d85839ecff0d474de5c0530ef51a011af91c651dfe3c11a3520ff754ac
+SHA512 (composer-2.1.2-1845e68.tgz) = ee7b4d29c0caca94be4a4b94fc42d4152445348f733cefae107097f1328a87dc09e0cd0c825e461abcf990c941048e2480b50a645809d82c2e783e818c8054b1

From 07f73f3a643d77273ee386e46bd5eabeb048d1c7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 10 Jun 2021 07:31:30 +0200
Subject: [PATCH 175/269] v2.1.3

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 221d175..3db1bc5 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    1845e6854aa3f37f2c6c24bc525541b00b8b28e4
+%global gh_commit    fc5c4573aafce3a018eb7f1f8f91cea423970f2e
 %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.1.0
 %global run_version  2.1.0
 
-%global upstream_version 2.1.2
+%global upstream_version 2.1.3
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -322,6 +322,9 @@ exit $ret
 
 
 %changelog
+* Thu Jun 10 2021 Remi Collet <remi@remirepo.net> - 2.1.3-1
+- update to 2.1.3
+
 * Mon Jun  7 2021 Remi Collet <remi@remirepo.net> - 2.1.2-1
 - update to 2.1.2
 
diff --git a/sources b/sources
index d9bd512..0323d79 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.2-1845e68.tgz) = ee7b4d29c0caca94be4a4b94fc42d4152445348f733cefae107097f1328a87dc09e0cd0c825e461abcf990c941048e2480b50a645809d82c2e783e818c8054b1
+SHA512 (composer-2.1.3-fc5c457.tgz) = e959d4e83a1b47d3f81e4ad9fded7b99bd43deb1ba1fc78d8f9819504813ca897a5a0a65cfe09b4f4f2eff7ba631b6d34a016a7fe5831747fd82b53818ec016b

From 108a81f03319390adf4de96e489f065d38570f3e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 14:57:24 +0000
Subject: [PATCH 176/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 881d9d8c7809f816565a00aa793b14aed82a2502 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 19:55:48 +0000
Subject: [PATCH 177/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 3db1bc5..b4f36e5 100644
--- a/composer.spec
+++ b/composer.spec
@@ -31,7 +31,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -322,6 +322,9 @@ exit $ret
 
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Thu Jun 10 2021 Remi Collet <remi@remirepo.net> - 2.1.3-1
 - update to 2.1.3
 

From 7c68b5d75caa4d75059aa3e56b09ea30f55983dc Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 22 Jul 2021 15:42:04 +0200
Subject: [PATCH 178/269] update to 2.1.4 raise dependency on
 justinrainbow/json-schema 5.2.11

---
 composer.spec | 49 ++++++++++++++-----------------------------------
 sources       |  2 +-
 2 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/composer.spec b/composer.spec
index b4f36e5..d99dca9 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,16 +10,17 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    fc5c4573aafce3a018eb7f1f8f91cea423970f2e
+%bcond_without       tests
+
+%global gh_commit    5701b38ec6c66dd143658e6aa18e1808d2d5dc4b
 %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 with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %global api_version  2.1.0
 %global run_version  2.1.0
 
-%global upstream_version 2.1.3
+%global upstream_version 2.1.4
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -31,7 +32,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -50,8 +51,7 @@ Patch1:         %{name}-noxdg.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
-%if %{with_tests}
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+%if %{with tests}
 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)
@@ -60,20 +60,8 @@ BuildRequires:  (php-composer(composer/xdebug-handler)   >= 2.0    with  php-com
 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(justinrainbow/json-schema) >= 5.2.10 with  php-composer(justinrainbow/json-schema) <  6)
+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)
-%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-jsonlint                             >= 1.4
-BuildRequires:  php-seld-phar-utils
-BuildRequires:  php-PsrLog
-BuildRequires:  php-justinrainbow-json-schema5           >= 5.2.10
-BuildRequires:  php-react-promise                        >= 2.7
-%endif
 BuildRequires:  %{symfony_prefix}-console    >= %{symfony_min}
 BuildRequires:  %{symfony_prefix}-finder     >= %{symfony_min}
 BuildRequires:  %{symfony_prefix}-filesystem >= %{symfony_min}
@@ -96,7 +84,7 @@ BuildRequires:  php-PsrLog          >= 1.1
 #        "composer/semver": "^3.0",
 #        "composer/spdx-licenses": "^1.2",
 #        "composer/xdebug-handler": "^2.0",
-#        "justinrainbow/json-schema": "^5.2.10",
+#        "justinrainbow/json-schema": "^5.2.11",
 #        "psr/log": "^1.0"
 #        "seld/jsonlint": "~1.4",
 #        "seld/phar-utils": "^1.0",
@@ -107,7 +95,6 @@ BuildRequires:  php-PsrLog          >= 1.1
 #        "react/promise": "^1.2 || ^2.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)
@@ -116,20 +103,8 @@ Requires:       (php-composer(composer/xdebug-handler)   >= 2.0    with  php-com
 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(justinrainbow/json-schema) >= 5.2.10 with  php-composer(justinrainbow/json-schema) <  6)
+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)
-%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-jsonlint                             >= 1.4
-Requires:       php-seld-phar-utils
-Requires:       php-PsrLog
-Requires:       php-justinrainbow-json-schema5           >= 5.2.10
-Requires:       php-react-promise                        >= 2.7
-%endif
 Requires:       %{symfony_prefix}-console    >= %{symfony_min}
 Requires:       %{symfony_prefix}-finder     >= %{symfony_min}
 Requires:       %{symfony_prefix}-process    >= %{symfony_min}
@@ -274,7 +249,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 : Online tests
 rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
@@ -322,6 +297,10 @@ exit $ret
 
 
 %changelog
+* Thu Jul 22 2021 Remi Collet <remi@remirepo.net> - 2.1.4-1
+- update to 2.1.4
+- raise dependency on justinrainbow/json-schema 5.2.11
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 0323d79..a9ae0fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.3-fc5c457.tgz) = e959d4e83a1b47d3f81e4ad9fded7b99bd43deb1ba1fc78d8f9819504813ca897a5a0a65cfe09b4f4f2eff7ba631b6d34a016a7fe5831747fd82b53818ec016b
+SHA512 (composer-2.1.4-5701b38.tgz) = 4c1cbdc74a0d42e1dfecd7a303ef2eca82b2da477c6c3b45a49f11048f501732a3dabf41ad4d7cdcc35ebff0a976c381d617e8f019c19ea9a1e357e45b00c785

From c13424a7bad7b2e856a762b871d4059bf3b923f6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 23 Jul 2021 11:43:04 +0200
Subject: [PATCH 179/269] v2.1.5

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index d99dca9..85b49e7 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    5701b38ec6c66dd143658e6aa18e1808d2d5dc4b
+%global gh_commit    ac679902e9f66b85a8f9d8c1c88180f609a8745d
 %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.4
+%global upstream_version 2.1.5
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -297,6 +297,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 23 2021 Remi Collet <remi@remirepo.net> - 2.1.5-1
+- update to 2.1.5
+
 * Thu Jul 22 2021 Remi Collet <remi@remirepo.net> - 2.1.4-1
 - update to 2.1.4
 - raise dependency on justinrainbow/json-schema 5.2.11
diff --git a/sources b/sources
index a9ae0fa..d4f2600 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.4-5701b38.tgz) = 4c1cbdc74a0d42e1dfecd7a303ef2eca82b2da477c6c3b45a49f11048f501732a3dabf41ad4d7cdcc35ebff0a976c381d617e8f019c19ea9a1e357e45b00c785
+SHA512 (composer-2.1.5-ac67990.tgz) = fde3bea2f997748df264247fa7722f80b626b020cef8ab16fe3528567d4f6cbbbf5febf0ff5e1eda5b28e15f198c332862e855d900b679bd64cdec3afdd1ac39

From ab4babeb93e4ad202fe01b90a1e87d9af387cf33 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 1 Sep 2021 12:19:15 +0200
Subject: [PATCH 180/269] v2.1.6

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 85b49e7..761ec99 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    ac679902e9f66b85a8f9d8c1c88180f609a8745d
+%global gh_commit    e5cac5f9d2354d08b67f1d21c664ae70d748c603
 %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.5
+%global upstream_version 2.1.6
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -297,6 +297,9 @@ exit $ret
 
 
 %changelog
+* Mon Aug 23 2021 Remi Collet <remi@remirepo.net> - 2.1.6-1
+- update to 2.1.6
+
 * Fri Jul 23 2021 Remi Collet <remi@remirepo.net> - 2.1.5-1
 - update to 2.1.5
 
diff --git a/sources b/sources
index d4f2600..5d50acd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.5-ac67990.tgz) = fde3bea2f997748df264247fa7722f80b626b020cef8ab16fe3528567d4f6cbbbf5febf0ff5e1eda5b28e15f198c332862e855d900b679bd64cdec3afdd1ac39
+SHA512 (composer-2.1.6-e5cac5f.tgz) = 465bba1054853c951dabd618560b4a8ccf2ff39370d53b4b7d0c6682cbfba6298fc1d52f129436356802ef978c88ef885f8d4fa8437ce18221dbea82c7ca079a

From 22d335b4c238877b9c66542b65294fd678959e35 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 14 Sep 2021 15:51:25 +0200
Subject: [PATCH 181/269] v2.1.7

---
 composer-rpm.patch | 72 +++++++++++++++++++++++-----------------------
 composer.spec      |  9 ++++--
 sources            |  2 +-
 3 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index d63b69b..cbb4b3c 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2021-06-04 09:21:49.000000000 +0200
-+++ ./bin/composer	2021-06-04 09:21:53.808648766 +0200
+--- ./bin/composer.rpm	2021-09-14 15:45:17.000000000 +0200
++++ ./bin/composer	2021-09-14 15:45:33.025118009 +0200
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
@@ -11,8 +11,8 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2021-06-04 09:21:49.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2021-06-04 09:21:53.808648766 +0200
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2021-09-14 15:45:17.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2021-09-14 15:45:33.025118009 +0200
 @@ -395,7 +395,7 @@ EOF;
          $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform));
  
@@ -23,9 +23,9 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2021-06-04 09:21:49.000000000 +0200
-+++ ./src/Composer/Compiler.php	2021-06-04 09:21:53.808648766 +0200
-@@ -100,7 +100,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm	2021-09-14 15:45:17.000000000 +0200
++++ ./src/Composer/Compiler.php	2021-09-14 15:45:33.025118009 +0200
+@@ -118,7 +118,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
          $finder->files()
@@ -34,9 +34,30 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
              ->sort($finderSort)
          ;
          foreach ($finder as $file) {
+diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
+--- ./src/Composer/InstalledVersions.php.rpm	2021-09-14 15:45:17.000000000 +0200
++++ ./src/Composer/InstalledVersions.php	2021-09-14 15:45:33.026118007 +0200
+@@ -251,7 +251,7 @@ class InstalledVersions
+         if (null === self::$installed) {
+             // only require the installed.php file if this file is loaded from its dumped location,
+             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+-            if (substr(__DIR__, -8, 1) !== 'C') {
++            if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
+                 self::$installed = include __DIR__ . '/installed.php';
+             } else {
+                 self::$installed = array();
+@@ -324,7 +324,7 @@ class InstalledVersions
+         if (null === self::$installed) {
+             // only require the installed.php file if this file is loaded from its dumped location,
+             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+-            if (substr(__DIR__, -8, 1) !== 'C') {
++            if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
+                 self::$installed = require __DIR__ . '/installed.php';
+             } else {
+                 self::$installed = array();
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2021-06-04 09:21:49.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2021-06-04 09:23:51.867361526 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2021-09-14 15:45:17.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2021-09-14 15:46:22.434026477 +0200
 @@ -34,7 +34,7 @@ class JsonFile
      const JSON_PRETTY_PRINT = 128;
      const JSON_UNESCAPED_UNICODE = 256;
@@ -44,9 +65,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
 -    const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json';
 +    const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
  
+     /** @var string */
      private $path;
-     private $httpDownloader;
-@@ -188,7 +188,7 @@ class JsonFile
+@@ -191,7 +191,7 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
              $isComposerSchemaFile = true;
@@ -56,8 +77,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2021-06-04 09:21:49.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2021-06-04 09:21:53.808648766 +0200
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2021-09-14 15:45:17.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2021-09-14 15:45:33.025118009 +0200
 @@ -93,7 +93,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
@@ -69,8 +90,8 @@ diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/
          if (!$validator->isValid()) {
              $errors = $validator->getErrors();
 diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php
---- ./tests/Composer/Test/PolyfillTestCase.php.rpm	2021-06-04 09:21:49.000000000 +0200
-+++ ./tests/Composer/Test/PolyfillTestCase.php	2021-06-04 09:21:53.808648766 +0200
+--- ./tests/Composer/Test/PolyfillTestCase.php.rpm	2021-09-14 15:45:17.000000000 +0200
++++ ./tests/Composer/Test/PolyfillTestCase.php	2021-09-14 15:45:33.026118007 +0200
 @@ -15,10 +15,35 @@ namespace Composer\Test {
      use PHPUnit\Framework\Constraint\LogicalNot;
      use PHPUnit\Framework\Constraint\StringContains;
@@ -108,24 +129,3 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po
      } else {
          abstract class PolyfillTestCase extends TestCase
          {
---- ./src/Composer/InstalledVersions.php.rpm	2021-06-07 08:18:59.326450774 +0200
-+++ ./src/Composer/InstalledVersions.php	2021-06-07 08:19:11.525413189 +0200
-@@ -251,7 +251,7 @@ class InstalledVersions
-         if (null === self::$installed) {
-             // only require the installed.php file if this file is loaded from its dumped location,
-             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
--            if (substr(__DIR__, -8, 1) !== 'C') {
-+            if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
-                 self::$installed = include __DIR__ . '/installed.php';
-             } else {
-                 self::$installed = array();
-@@ -324,7 +324,7 @@ class InstalledVersions
-         if (null === self::$installed) {
-             // only require the installed.php file if this file is loaded from its dumped location,
-             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
--            if (substr(__DIR__, -8, 1) !== 'C') {
-+            if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
-                 self::$installed = require __DIR__ . '/installed.php';
-             } else {
-                 self::$installed = array();
-
diff --git a/composer.spec b/composer.spec
index 761ec99..087bbc5 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    e5cac5f9d2354d08b67f1d21c664ae70d748c603
+%global gh_commit    f381e45f0b83a602a315613e08fffe0d8f2288c8
 %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.6
+%global upstream_version 2.1.7
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -272,7 +272,7 @@ find tests \
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php73 php74 php80; do
+for cmd in php php73 php74 php80 php81; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_phpunit} \
       $FILTER \
@@ -297,6 +297,9 @@ exit $ret
 
 
 %changelog
+* Tue Sep 14 2021 Remi Collet <remi@remirepo.net> - 2.1.7-1
+- update to 2.1.7
+
 * Mon Aug 23 2021 Remi Collet <remi@remirepo.net> - 2.1.6-1
 - update to 2.1.6
 
diff --git a/sources b/sources
index 5d50acd..fc16048 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.6-e5cac5f.tgz) = 465bba1054853c951dabd618560b4a8ccf2ff39370d53b4b7d0c6682cbfba6298fc1d52f129436356802ef978c88ef885f8d4fa8437ce18221dbea82c7ca079a
+SHA512 (composer-2.1.7-f381e45.tgz) = 9c51231f619a6678f61efe3ed789d723eb315a391d8561f660f80e75eb22c7b47bbe6c6d74c6b91a17734fe973633f22fc7802f5ccbaebd6b1089fd29c5a65f0

From 1bea4b046b75b24b1cda7b6663b9da0c646b3c5c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 20 Sep 2021 15:25:51 +0200
Subject: [PATCH 182/269] v2.1.8

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 087bbc5..5cd75a2 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    f381e45f0b83a602a315613e08fffe0d8f2288c8
+%global gh_commit    24d38e9686092de05214cafa187dc282a5d89497
 %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.7
+%global upstream_version 2.1.8
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -297,6 +297,9 @@ exit $ret
 
 
 %changelog
+* Sat Sep 18 2021 Remi Collet <remi@remirepo.net> - 2.1.8-1
+- update to 2.1.8
+
 * Tue Sep 14 2021 Remi Collet <remi@remirepo.net> - 2.1.7-1
 - update to 2.1.7
 
diff --git a/sources b/sources
index fc16048..1616837 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.7-f381e45.tgz) = 9c51231f619a6678f61efe3ed789d723eb315a391d8561f660f80e75eb22c7b47bbe6c6d74c6b91a17734fe973633f22fc7802f5ccbaebd6b1089fd29c5a65f0
+SHA512 (composer-2.1.8-24d38e9.tgz) = 558ca00ad8ae77d3705397f2a5cfb4cf79550c82e8be37b15a04c60d138d52d433fd432321ca6288137a81e4d806681312e26c6d39291a6825e9cf4bcc08e793

From bc9b5b34de0dddaeffebd4b8a6a937b68a778d0f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 5 Oct 2021 10:28:52 +0200
Subject: [PATCH 183/269] v2.1.9

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 5cd75a2..2c187bc 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    24d38e9686092de05214cafa187dc282a5d89497
+%global gh_commit    e558c88f28d102d497adec4852802c0dc14c7077
 %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.8
+%global upstream_version 2.1.9
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -297,6 +297,9 @@ exit $ret
 
 
 %changelog
+* Tue Oct  5 2021 Remi Collet <remi@remirepo.net> - 2.1.9-1
+- update to 2.1.9
+
 * Sat Sep 18 2021 Remi Collet <remi@remirepo.net> - 2.1.8-1
 - update to 2.1.8
 
diff --git a/sources b/sources
index 1616837..85e5bf8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.8-24d38e9.tgz) = 558ca00ad8ae77d3705397f2a5cfb4cf79550c82e8be37b15a04c60d138d52d433fd432321ca6288137a81e4d806681312e26c6d39291a6825e9cf4bcc08e793
+SHA512 (composer-2.1.9-e558c88.tgz) = 63daa157d4d2ea5c5d037df8ecaf06984ccb7d95a772b7a2edb4c197d44b9bbc692b77100f1cb07b0127509535deace4505943777e8ca7c61175f3d98510d762

From c1fca0e48e87077470cc11646acaeae243b97380 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 2 Nov 2021 08:42:03 +0100
Subject: [PATCH 184/269] update to 2.1.10

allow psr/log v2
---
 composer.spec | 19 +++++++++++++------
 sources       |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/composer.spec b/composer.spec
index 2c187bc..6f221a6 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
 
@@ -59,7 +59,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)
 BuildRequires:  %{symfony_prefix}-console    >= %{symfony_min}
@@ -85,7 +85,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",
@@ -102,7 +102,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)
 Requires:       %{symfony_prefix}-console    >= %{symfony_min}
@@ -182,7 +182,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',
 ]);
@@ -297,6 +300,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
 
diff --git a/sources b/sources
index 85e5bf8..fe1d0c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.9-e558c88.tgz) = 63daa157d4d2ea5c5d037df8ecaf06984ccb7d95a772b7a2edb4c197d44b9bbc692b77100f1cb07b0127509535deace4505943777e8ca7c61175f3d98510d762
+SHA512 (composer-2.1.10-ea5f64d.tgz) = fa8f0665864037fd0908e80a47880822a988f939209875b1a5e5469b83a0231d9b1f0af29bde889788bfd0e78ffc54d7502e03980de40538190b95e339b39740

From b9eef84abedf437714b69a5d0e51986e944b658f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 2 Nov 2021 13:42:03 +0100
Subject: [PATCH 185/269] v2.1.11

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 6f221a6..6a6992b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    ea5f64d1a15c66942979b804c9fb3686be852ca0
+%global gh_commit    ddc81bb4718747cc93330ccf832e6be8a6c1d015
 %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.10
+%global upstream_version 2.1.11
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -300,6 +300,9 @@ exit $ret
 
 
 %changelog
+* Tue Nov  2 2021 Remi Collet <remi@remirepo.net> - 2.1.11-1
+- update to 2.1.11
+
 * Sat Oct 30 2021 Remi Collet <remi@remirepo.net> - 2.1.10-1
 - update to 2.1.10
 - allow psr/log v2
diff --git a/sources b/sources
index fe1d0c7..fcee2a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.10-ea5f64d.tgz) = fa8f0665864037fd0908e80a47880822a988f939209875b1a5e5469b83a0231d9b1f0af29bde889788bfd0e78ffc54d7502e03980de40538190b95e339b39740
+SHA512 (composer-2.1.11-ddc81bb.tgz) = 340fd1e1320f523e3df36a9318bc2728abc6695eafbe1cee70edf6b65c5f7fd4bd0ae1aa3419da8fa7fe04a7503e787d65a683955aef87975851bbcf84963b94

From 13c11c61de3d02bbb20288391c70b483988a8708 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 10 Nov 2021 08:37:46 +0100
Subject: [PATCH 186/269] v2.1.12

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 6a6992b..f5ef1b3 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    ddc81bb4718747cc93330ccf832e6be8a6c1d015
+%global gh_commit    6e3c2b122e0ec41a7e885fcaf19fa15e2e0819a0
 %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.11
+%global upstream_version 2.1.12
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -300,6 +300,9 @@ exit $ret
 
 
 %changelog
+* Tue Nov  9 2021 Remi Collet <remi@remirepo.net> - 2.1.12-1
+- update to 2.1.12
+
 * Tue Nov  2 2021 Remi Collet <remi@remirepo.net> - 2.1.11-1
 - update to 2.1.11
 
diff --git a/sources b/sources
index fcee2a7..d953e33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.11-ddc81bb.tgz) = 340fd1e1320f523e3df36a9318bc2728abc6695eafbe1cee70edf6b65c5f7fd4bd0ae1aa3419da8fa7fe04a7503e787d65a683955aef87975851bbcf84963b94
+SHA512 (composer-2.1.12-6e3c2b1.tgz) = 834e06a70deb4bed4887e6acf626de2a2b27f3cf42cc405dcdbe74cf25ab14750123dfd780243e3fec0920adc0ac96ed72517600f39134e3730f17dc7a7060b6

From 9b68f26232274d3ae1c4b3c00b701dfbefd2a643 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 30 Nov 2021 11:43:39 +0100
Subject: [PATCH 187/269] v2.1.14

---
 composer.spec | 11 +++++++----
 sources       |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer.spec b/composer.spec
index f5ef1b3..0182bfb 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    6e3c2b122e0ec41a7e885fcaf19fa15e2e0819a0
+%global gh_commit    cd28fc05b0c9d3beaf58b57018725c4dc15a6446
 %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.12
+%global upstream_version 2.1.14
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -88,7 +88,7 @@ BuildRequires:  php-PsrLog          >= 1.1
 #        "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",
+#        "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",
@@ -275,7 +275,7 @@ find tests \
 
 # testIntegration may hang on local build
 ret=0
-for cmd in php php73 php74 php80 php81; do
+for cmd in php php74 php80 php81; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_phpunit} \
       $FILTER \
@@ -300,6 +300,9 @@ exit $ret
 
 
 %changelog
+* Tue Nov 30 2021 Remi Collet <remi@remirepo.net> - 2.1.14-1
+- update to 2.1.14
+
 * Tue Nov  9 2021 Remi Collet <remi@remirepo.net> - 2.1.12-1
 - update to 2.1.12
 
diff --git a/sources b/sources
index d953e33..2b196b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.12-6e3c2b1.tgz) = 834e06a70deb4bed4887e6acf626de2a2b27f3cf42cc405dcdbe74cf25ab14750123dfd780243e3fec0920adc0ac96ed72517600f39134e3730f17dc7a7060b6
+SHA512 (composer-2.1.14-cd28fc0.tgz) = 318a2642cdd4db84fd7888f5ac4e190d5c03c870a620e024135da5493090e5fc3066c147cfca62013b17e5c4ab15fc13ce72aeaffd2a443017b6ce710ffd0278

From 0f53a95fd0ec35870ed1973c4ad68e5c0dbe774c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 22 Dec 2021 11:56:15 +0100
Subject: [PATCH 188/269] update to 2.2.0

add dependency on composer/pcre
---
 composer.spec | 18 +++++++++++++-----
 sources       |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/composer.spec b/composer.spec
index 0182bfb..6ab2cbf 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,15 +12,15 @@
 
 %bcond_without       tests
 
-%global gh_commit    cd28fc05b0c9d3beaf58b57018725c4dc15a6446
+%global gh_commit    e174a4c4324f50a6f2de472aa1055c24a2fe2b2a
 %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.1.0
-%global run_version  2.1.0
+%global api_version  2.2.0
+%global run_version  2.2.0
 
-%global upstream_version 2.1.14
+%global upstream_version 2.2.0
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -62,6 +62,7 @@ BuildRequires:  (php-composer(seld/phar-utils)           >= 1.0    with  php-com
 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)
+BuildRequires:  (php-composer(composer/pcre)             >= 1.0    with  php-composer(composer/pcre)             <  2)
 BuildRequires:  %{symfony_prefix}-console    >= %{symfony_min}
 BuildRequires:  %{symfony_prefix}-finder     >= %{symfony_min}
 BuildRequires:  %{symfony_prefix}-filesystem >= %{symfony_min}
@@ -92,7 +93,8 @@ BuildRequires:  php-PsrLog          >= 1.1
 #        "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"
+#        "react/promise": "^1.2 || ^2.7",
+#        "composer/pcre": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
 Requires:       (php-composer(composer/ca-bundle)        >= 1.0    with  php-composer(composer/ca-bundle)        <  2)
@@ -105,6 +107,7 @@ Requires:       (php-composer(seld/phar-utils)           >= 1.0    with  php-com
 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)
+Requires:       (php-composer(composer/pcre)             >= 1.0    with  php-composer(composer/pcre)             <  2)
 Requires:       %{symfony_prefix}-console    >= %{symfony_min}
 Requires:       %{symfony_prefix}-finder     >= %{symfony_min}
 Requires:       %{symfony_prefix}-process    >= %{symfony_min}
@@ -182,6 +185,7 @@ 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/Psr/Log2/autoload.php',
         '%{_datadir}/php/Psr/Log/autoload.php',
@@ -300,6 +304,10 @@ exit $ret
 
 
 %changelog
+* Wed Dec 22 2021 Remi Collet <remi@remirepo.net> - 2.2.0-1
+- update to 2.2.0
+- add dependency on composer/pcre
+
 * Tue Nov 30 2021 Remi Collet <remi@remirepo.net> - 2.1.14-1
 - update to 2.1.14
 
diff --git a/sources b/sources
index 2b196b1..6ffe111 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.1.14-cd28fc0.tgz) = 318a2642cdd4db84fd7888f5ac4e190d5c03c870a620e024135da5493090e5fc3066c147cfca62013b17e5c4ab15fc13ce72aeaffd2a443017b6ce710ffd0278
+SHA512 (composer-2.2.0-e174a4c.tgz) = 55b7c49708ee6d7776fa1422bbbbc2001a3d69ab86e42ef2c9657c2a824aae2be5fb6e149d2f5af56de6831bf7c3cfc7109a43b165d3423ac2394243db1475f7

From 4d4a8a1acc0e9c61da5631e2cac28285a1fba347 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 23 Dec 2021 07:43:19 +0100
Subject: [PATCH 189/269] v2.2.1

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 6ab2cbf..27474ec 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    e174a4c4324f50a6f2de472aa1055c24a2fe2b2a
+%global gh_commit    bbc265e16561ab8e0f5e7cac395ea72640251f0c
 %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.2.0
 %global run_version  2.2.0
 
-%global upstream_version 2.2.0
+%global upstream_version 2.2.1
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -304,6 +304,9 @@ exit $ret
 
 
 %changelog
+* Thu Dec 23 2021 Remi Collet <remi@remirepo.net> - 2.2.1-1
+- update to 2.2.1
+
 * Wed Dec 22 2021 Remi Collet <remi@remirepo.net> - 2.2.0-1
 - update to 2.2.0
 - add dependency on composer/pcre
diff --git a/sources b/sources
index 6ffe111..5d80a7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.0-e174a4c.tgz) = 55b7c49708ee6d7776fa1422bbbbc2001a3d69ab86e42ef2c9657c2a824aae2be5fb6e149d2f5af56de6831bf7c3cfc7109a43b165d3423ac2394243db1475f7
+SHA512 (composer-2.2.1-bbc265e.tgz) = 0afb658d09f96fb3ccb73fcd8a60d9e0aaa2bf7decf6c3081e9c57be920e88d261eedda4cd1298df35c4e67c7932910ed7d29c79ca00ec1d63cb5ff1347550db

From 850346b461a05342b3d79b9f44fd145166a5bfce Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 3 Jan 2022 08:10:35 +0100
Subject: [PATCH 190/269] v2.2.3

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index 27474ec..8562066 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,15 +12,15 @@
 
 %bcond_without       tests
 
-%global gh_commit    bbc265e16561ab8e0f5e7cac395ea72640251f0c
+%global gh_commit    3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a
 %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 run_version  2.2.0
+%global run_version  2.2.2
 
-%global upstream_version 2.2.1
+%global upstream_version 2.2.3
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -304,6 +304,9 @@ exit $ret
 
 
 %changelog
+* Sat Jan  1 2022 Remi Collet <remi@remirepo.net> - 2.2.3-1
+- update to 2.2.3
+
 * Thu Dec 23 2021 Remi Collet <remi@remirepo.net> - 2.2.1-1
 - update to 2.2.1
 
diff --git a/sources b/sources
index 5d80a7a..36d9283 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.1-bbc265e.tgz) = 0afb658d09f96fb3ccb73fcd8a60d9e0aaa2bf7decf6c3081e9c57be920e88d261eedda4cd1298df35c4e67c7932910ed7d29c79ca00ec1d63cb5ff1347550db
+SHA512 (composer-2.2.3-3c92ba5.tgz) = 406bec56bea0150f6fb63d269f8beaf9f12733cdd50c547eeaedb34f5a2b500bffa10834ff85c9f6edd95f80cec8763e85fe9248fd891a18cfd1a99e8141501f

From 889766206cdb64c7a8f4eff2b4ba0662bf507110 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 10 Jan 2022 08:02:16 +0100
Subject: [PATCH 191/269] v2.2.4

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index 8562066..91a5503 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2021 Remi Collet
+# Copyright (c) 2015-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    3c92ba5cdc7d48b7db2dcd197e6fa0e8fa6d9f4a
+%global gh_commit    8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f
 %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.2.0
 %global run_version  2.2.2
 
-%global upstream_version 2.2.3
+%global upstream_version 2.2.4
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -304,6 +304,9 @@ exit $ret
 
 
 %changelog
+* Sun Jan  9 2022 Remi Collet <remi@remirepo.net> - 2.2.4-1
+- update to 2.2.4
+
 * Sat Jan  1 2022 Remi Collet <remi@remirepo.net> - 2.2.3-1
 - update to 2.2.3
 
diff --git a/sources b/sources
index 36d9283..0c91968 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.3-3c92ba5.tgz) = 406bec56bea0150f6fb63d269f8beaf9f12733cdd50c547eeaedb34f5a2b500bffa10834ff85c9f6edd95f80cec8763e85fe9248fd891a18cfd1a99e8141501f
+SHA512 (composer-2.2.4-8a5ad75.tgz) = 383c9bcfb39f772c8dfb316b798c383afa0ed899e081c5c03395b52bf3dc5263472719677dde65c412f9a8ca8bcfccacfc097a2465901d1671d232d496d8e868

From 9bb7c5678171ca0e7ae5a4597f7986492f8dbf89 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 23:43:12 +0000
Subject: [PATCH 192/269] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 91a5503..b47c90a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -32,7 +32,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -304,6 +304,9 @@ exit $ret
 
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Sun Jan  9 2022 Remi Collet <remi@remirepo.net> - 2.2.4-1
 - update to 2.2.4
 

From 20b248a36985e012a3f5764cf409fa304269937f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 24 Jan 2022 10:09:45 +0100
Subject: [PATCH 193/269] v2.2.5

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index b47c90a..62b7a0f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    8a5ad75194f901e3b39ece4bbd22cbdabc79ae8f
+%global gh_commit    22c41ef275c7bb64fa28fb2c0871a39666832cb9
 %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.2.0
 %global run_version  2.2.2
 
-%global upstream_version 2.2.4
+%global upstream_version 2.2.5
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -32,7 +32,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 License:        MIT
@@ -304,6 +304,9 @@ exit $ret
 
 
 %changelog
+* Sat Jan 22 2022 Remi Collet <remi@remirepo.net> - 2.2.5-1
+- update to 2.2.5
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 0c91968..b3069cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.4-8a5ad75.tgz) = 383c9bcfb39f772c8dfb316b798c383afa0ed899e081c5c03395b52bf3dc5263472719677dde65c412f9a8ca8bcfccacfc097a2465901d1671d232d496d8e868
+SHA512 (composer-2.2.5-22c41ef.tgz) = 5854ee3efca274c6c88e327244edec91c3e297db0921382a0cd30767d87db0407040245055b7b3484c6932afd4b97bbc99d25e87afa8ebb00173591c6948b7fb

From 01bbe4863e571beb02bd69170fef9dad54cf4f2e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 25 Jan 2022 11:05:08 +0100
Subject: [PATCH 194/269] use system libraries on Fedora, bundled libraries on
 EL

---
 composer-noxdg.patch |  6 +--
 composer-rpm.patch   | 54 +++++++++++++++----------
 composer.spec        | 96 +++++++++++++++++++++++++++++++++++++-------
 makesrc.sh           | 34 ++++++++++------
 sources              |  2 +-
 5 files changed, 140 insertions(+), 52 deletions(-)

diff --git a/composer-noxdg.patch b/composer-noxdg.patch
index fc6b127..607e449 100644
--- a/composer-noxdg.patch
+++ b/composer-noxdg.patch
@@ -1,7 +1,7 @@
 diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php
---- ./src/Composer/Factory.php.noxdg	2021-05-31 15:37:50.548115679 +0200
-+++ ./src/Composer/Factory.php	2021-05-31 15:39:05.192882880 +0200
-@@ -653,6 +653,10 @@ class Factory
+--- ./src/Composer/Factory.php.noxdg	2022-01-25 09:39:15.000000000 +0100
++++ ./src/Composer/Factory.php	2022-01-25 09:50:21.374957261 +0100
+@@ -701,6 +701,10 @@ class Factory
       */
      private static function useXdg()
      {
diff --git a/composer-rpm.patch b/composer-rpm.patch
index cbb4b3c..bdf807b 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2021-09-14 15:45:17.000000000 +0200
-+++ ./bin/composer	2021-09-14 15:45:33.025118009 +0200
+--- ./bin/composer.rpm	2022-01-25 09:39:15.000000000 +0100
++++ ./bin/composer	2022-01-25 09:50:21.372957269 +0100
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2021-09-14 15:45:17.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2021-09-14 15:45:33.025118009 +0200
-@@ -395,7 +395,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2022-01-25 09:39:15.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-01-25 09:50:21.373957265 +0100
+@@ -419,7 +419,7 @@ EOF;
          $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform));
  
          $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,9 +23,9 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2021-09-14 15:45:17.000000000 +0200
-+++ ./src/Composer/Compiler.php	2021-09-14 15:45:33.025118009 +0200
-@@ -118,7 +118,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm	2022-01-25 09:39:15.000000000 +0100
++++ ./src/Composer/Compiler.php	2022-01-25 09:50:21.373957265 +0100
+@@ -125,7 +125,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
          $finder->files()
@@ -35,9 +35,9 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
---- ./src/Composer/InstalledVersions.php.rpm	2021-09-14 15:45:17.000000000 +0200
-+++ ./src/Composer/InstalledVersions.php	2021-09-14 15:45:33.026118007 +0200
-@@ -251,7 +251,7 @@ class InstalledVersions
+--- ./src/Composer/InstalledVersions.php.rpm	2022-01-25 09:39:15.000000000 +0100
++++ ./src/Composer/InstalledVersions.php	2022-01-25 09:50:21.373957265 +0100
+@@ -264,7 +264,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
              // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
@@ -46,7 +46,7 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
                  self::$installed = include __DIR__ . '/installed.php';
              } else {
                  self::$installed = array();
-@@ -324,7 +324,7 @@ class InstalledVersions
+@@ -337,7 +337,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
              // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
@@ -56,9 +56,9 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
              } else {
                  self::$installed = array();
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2021-09-14 15:45:17.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2021-09-14 15:46:22.434026477 +0200
-@@ -34,7 +34,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2022-01-25 09:39:15.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2022-01-25 09:50:21.373957265 +0100
+@@ -35,7 +35,7 @@ class JsonFile
      const JSON_PRETTY_PRINT = 128;
      const JSON_UNESCAPED_UNICODE = 256;
  
@@ -67,7 +67,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      /** @var string */
      private $path;
-@@ -191,7 +191,7 @@ class JsonFile
+@@ -197,7 +197,7 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
              $isComposerSchemaFile = true;
@@ -77,9 +77,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2021-09-14 15:45:17.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2021-09-14 15:45:33.025118009 +0200
-@@ -93,7 +93,8 @@ class ComposerSchemaTest extends TestCas
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-01-25 09:39:15.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-01-25 09:50:21.373957265 +0100
+@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check($json)
      {
          $validator = new Validator();
@@ -90,8 +90,8 @@ diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/
          if (!$validator->isValid()) {
              $errors = $validator->getErrors();
 diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php
---- ./tests/Composer/Test/PolyfillTestCase.php.rpm	2021-09-14 15:45:17.000000000 +0200
-+++ ./tests/Composer/Test/PolyfillTestCase.php	2021-09-14 15:45:33.026118007 +0200
+--- ./tests/Composer/Test/PolyfillTestCase.php.rpm	2022-01-25 09:39:15.000000000 +0100
++++ ./tests/Composer/Test/PolyfillTestCase.php	2022-01-25 09:50:21.373957265 +0100
 @@ -15,10 +15,35 @@ namespace Composer\Test {
      use PHPUnit\Framework\Constraint\LogicalNot;
      use PHPUnit\Framework\Constraint\StringContains;
@@ -129,3 +129,15 @@ diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/Po
      } else {
          abstract class PolyfillTestCase extends TestCase
          {
+diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2022-01-25 09:50:57.595802751 +0100
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-01-25 09:51:36.038638770 +0100
+@@ -125,7 +125,7 @@ class CaBundle
+      */
+     public static function getBundledCaBundlePath()
+     {
+-        $caBundleFile = __DIR__.'/../res/cacert.pem';
++        $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always
+ 
+         // cURL does not understand 'phar://' paths
+         // see https://github.com/composer/ca-bundle/issues/10
diff --git a/composer.spec b/composer.spec
index 62b7a0f..72f5399 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,13 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
+%if 0%{?fedora}
 %bcond_without       tests
+%bcond_without       syslib
+%else
+%bcond_with          tests
+%bcond_with          syslib
+%endif
 
 %global gh_commit    22c41ef275c7bb64fa28fb2c0871a39666832cb9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
@@ -32,9 +38,10 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
+# composer and all dependencies are MIT
 License:        MIT
 URL:            https://getcomposer.org/
 Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
@@ -50,7 +57,10 @@ Patch0:         %{name}-rpm.patch
 Patch1:         %{name}-noxdg.patch
 
 BuildArch:      noarch
+# platform set in makesrc.sh
+BuildRequires:  php(language) >= 7.4
 BuildRequires:  php-cli
+BuildRequires:  php-json
 %if %{with tests}
 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)
@@ -58,8 +68,8 @@ BuildRequires:  (php-composer(composer/semver)           >= 3.0    with  php-com
 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(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)                   <  3)
+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(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)
@@ -74,8 +84,6 @@ BuildRequires:  php-zip
 BuildRequires:  %{_phpunit}
 # For autoloader
 BuildRequires:  php-fedora-autoloader-devel
-BuildRequires:  php-seld-phar-utils >= 1.1
-BuildRequires:  php-PsrLog          >= 1.1
 %endif
 
 # From composer.json, "require": {
@@ -95,16 +103,17 @@ BuildRequires:  php-PsrLog          >= 1.1
 #        "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)                           >= 5.3.2
+Requires:       php(language)                           >= 7.4
 Requires:       php-cli
+%if %{with syslib}
 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)   >= 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)                   <  3)
+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(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)
@@ -112,6 +121,38 @@ Requires:       %{symfony_prefix}-console    >= %{symfony_min}
 Requires:       %{symfony_prefix}-finder     >= %{symfony_min}
 Requires:       %{symfony_prefix}-process    >= %{symfony_min}
 Requires:       %{symfony_prefix}-filesystem >= %{symfony_min}
+# For our autoloader
+Requires:       php-composer(fedora/autoloader)
+%else
+# System certificates
+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.2.7
+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-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-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-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-service-contracts) = v2.5.0
+Provides:       bundled(php-symfony-string) = v5.4.2
+%endif
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives",
@@ -119,10 +160,6 @@ Requires:       %{symfony_prefix}-filesystem >= %{symfony_min}
 Requires:       php-openssl
 Requires:       php-zip
 Requires:       php-zlib
-# For our autoloader
-Requires:       php-composer(fedora/autoloader)
-Requires:       php-seld-phar-utils >= 1.1
-Requires:       php-PsrLog          >= 1.1
 # From phpcompatinfo for version 2.0.0
 Requires:       php-ctype
 Requires:       php-curl
@@ -170,6 +207,12 @@ if grep -r '\.\./res'; then
 	exit 1
 fi
 
+rm src/bootstrap.php
+rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem
+
+%if %{with syslib}
+rm -rf src/Composer/vendor
+
 phpab --template fedora --output src/Composer/autoload.php src/Composer
 cat << 'EOF' | tee -a src/Composer/autoload.php
 
@@ -201,8 +244,30 @@ require 'Composer/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/');
 EOF
 
-rm src/bootstrap.php
+%else
+: symlink autoloader for library
+ln -s vendor/autoload.php src/Composer/autoload.php
 
+: fix layout
+sed -e "s:/../..' . '/src/Composer::" -i src/Composer/vendor/composer/autoload_static.php
+
+: List bundled libraries and Licenses
+php -r '
+	$pkgs = file_get_contents("src/Composer/vendor/composer/installed.json");
+	$pkgs = json_decode($pkgs, true);
+	if (!is_array($pkgs) || !isset($pkgs["packages"])) {
+        echo "cant decode json file\n";
+		exit(3);
+	}
+	$lic = [];
+    foreach($pkgs["packages"] as $pkg) {
+        printf("Provides:       bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]);
+        $lic = array_merge($lic, $pkg["license"]);
+	}
+	sort($lic);
+	printf("\nLicense: %s\n\n", implode(" and ", array_unique($lic)));
+'
+%endif
 
 : fix reported version
 %if 0%{?gh_date}
@@ -256,7 +321,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %check
-%if %{with tests}
+%if %{with tests} && %{with syslib}
 : Online tests
 rm tests/Composer/Test/Util/RemoteFilesystemTest.php
 
@@ -304,6 +369,9 @@ exit $ret
 
 
 %changelog
+* Tue Jan 25 2022 Remi Collet <remi@remirepo.net> - 2.2.5-2
+- use system libraries on Fedora, bundled libraries on EL
+
 * Sat Jan 22 2022 Remi Collet <remi@remirepo.net> - 2.2.5-1
 - update to 2.2.5
 
diff --git a/makesrc.sh b/makesrc.sh
index 9615a91..1d89e2e 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -8,21 +8,29 @@ PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec)
 COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
 SHORT=${COMMIT:0:7}
 
-echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n"
+if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz ]; then
+	echo skip $NAME-$VERSION$PREVER-$SHORT.tgz already here
+else
+	echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n"
 
-echo "Cloning..."
-git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+	echo "Cloning..."
+	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
 
-echo "Getting commit..."
-pushd $PROJECT-$COMMIT
-git checkout $COMMIT
-cp composer.json ../composer.json
-popd
+	echo "Getting commit..."
+	pushd $PROJECT-$COMMIT
+		git checkout $COMMIT || exit 1
+		cp composer.json ../composer.json
+		composer config platform.php 7.4
+		rm composer.lock
+		export COMPOSER_VENDOR_DIR=src/Composer/vendor
+		composer install --no-interaction --no-progress --no-dev --optimize-autoloader
+		cp src/Composer/vendor/composer/installed.json ../
+	popd
 
-echo "Archiving..."
-tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
-
-echo "Cleaning..."
-rm -rf $PROJECT-$COMMIT
+	echo "Archiving..."
+	tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
 
+	echo "Cleaning..."
+	rm -rf $PROJECT-$COMMIT
+fi
 echo "Done."
diff --git a/sources b/sources
index b3069cc..febbfd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.5-22c41ef.tgz) = 5854ee3efca274c6c88e327244edec91c3e297db0921382a0cd30767d87db0407040245055b7b3484c6932afd4b97bbc99d25e87afa8ebb00173591c6948b7fb
+SHA512 (composer-2.2.5-22c41ef.tgz) = dce37e84638863780975745e09771eaf473561eddd6557f8cd0a0de79e4b78dde6e92a7002287d4fb857d3178a6a17d142df1f9dd4d61dc0258af6cf49717205

From 47cab181a14a74891a135d94b441889e7c855466 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 25 Jan 2022 11:24:48 +0100
Subject: [PATCH 195/269] add missing requires on php-dom

---
 composer.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 72f5399..879f0e6 100644
--- a/composer.spec
+++ b/composer.spec
@@ -160,10 +160,11 @@ Provides:       bundled(php-symfony-string) = v5.4.2
 Requires:       php-openssl
 Requires:       php-zip
 Requires:       php-zlib
-# From phpcompatinfo for version 2.0.0
+# From phpcompatinfo for version 2.2.5
 Requires:       php-ctype
 Requires:       php-curl
 Requires:       php-date
+Requires:       php-dom
 Requires:       php-filter
 Requires:       php-hash
 Requires:       php-iconv

From 358d437f30581d8689f81fced48fcb993c88f097 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Feb 2022 10:02:33 +0100
Subject: [PATCH 196/269] v2.2.6

---
 composer.spec | 32 +++++++++++++++++++-------------
 makesrc.sh    |  2 +-
 sources       |  2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)

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

From 1d2985b4de91a85660d10599ff5fba277d478ef6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 25 Feb 2022 12:29:07 +0100
Subject: [PATCH 197/269] v2.2.7

---
 composer.spec | 22 ++++++++++++++--------
 sources       |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/composer.spec b/composer.spec
index a753fa4..7deeea4 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
 
@@ -66,7 +66,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)
@@ -92,7 +92,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",
@@ -110,7 +110,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)
@@ -132,11 +132,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
@@ -218,7 +218,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',
@@ -373,6 +376,9 @@ exit $ret
 
 
 %changelog
+* Fri Feb 25 2022 Remi Collet <remi@remirepo.net> - 2.2.7-1
+- update to 2.2.7
+
 * Sat Feb  5 2022 Remi Collet <remi@remirepo.net> - 2.2.6-1
 - update to 2.2.6
 
diff --git a/sources b/sources
index dc98f1f..94811f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.6-ce785a1.tgz) = e7fd81e9705686dae7f5f3b88a7b4ce3a571314505e7558e739d94432e04c893e20da5a2ee00d89a03e91c2899bdfd2271f615ed62f73297bf89b9a9617fab95
+SHA512 (composer-2.2.7-061d154.tgz) = faa7281e153ea21e9b93ce42efcce01e54cea1978dbfa56b65637ca8b64d811cdb8a110d863a5b1e2c824337d3dd7b5ea4ca943192015b18ebf99c3aa6c948d6

From e90af0dd160909edb436bd723ca1bba94a8c2c14 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 15 Mar 2022 14:07:17 +0100
Subject: [PATCH 198/269] v2.2.8

(cherry picked from commit 6769264671ef9f4e93c3a193ab425161799553e1)
---
 composer.spec | 29 ++++++++++++++++-------------
 sources       |  2 +-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/composer.spec b/composer.spec
index 7deeea4..ff4293b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    061d154dfdde157cbf453c4695e6af21c0e93903
+%global gh_commit    26a587345daa2772bbe2006f13cd9d7f92b242eb
 %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.7
+%global upstream_version 2.2.8
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -130,26 +130,26 @@ 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.9
+Provides:       bundled(php-composer-semver) = 3.3.0
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.6
-Provides:       bundled(php-composer-xdebug-handler) = 3.0.2
+Provides:       bundled(php-composer-xdebug-handler) = 3.0.3
 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.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
+Provides:       bundled(php-symfony-console) = v5.4.5
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.0
-Provides:       bundled(php-symfony-filesystem) = v5.4.3
+Provides:       bundled(php-symfony-filesystem) = v5.4.6
 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.3
+Provides:       bundled(php-symfony-polyfill-ctype) = v1.25.0
+Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0
+Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.25.0
+Provides:       bundled(php-symfony-polyfill-mbstring) = v1.25.0
+Provides:       bundled(php-symfony-polyfill-php73) = v1.25.0
+Provides:       bundled(php-symfony-polyfill-php80) = v1.25.0
+Provides:       bundled(php-symfony-process) = v5.4.5
 Provides:       bundled(php-symfony-service-contracts) = v2.5.0
 Provides:       bundled(php-symfony-string) = v5.4.3
 %endif
@@ -376,6 +376,9 @@ exit $ret
 
 
 %changelog
+* Tue Mar 15 2022 Remi Collet <remi@remirepo.net> - 2.2.8-1
+- update to 2.2.8
+
 * Fri Feb 25 2022 Remi Collet <remi@remirepo.net> - 2.2.7-1
 - update to 2.2.7
 
diff --git a/sources b/sources
index 94811f3..ff11b52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.7-061d154.tgz) = faa7281e153ea21e9b93ce42efcce01e54cea1978dbfa56b65637ca8b64d811cdb8a110d863a5b1e2c824337d3dd7b5ea4ca943192015b18ebf99c3aa6c948d6
+SHA512 (composer-2.2.8-26a5873.tgz) = ca2dda3c6c17c3b3706626f5411ed2f8205b632d7d9e26a89dc4788f13d9469294a7838bb9fd615013b352aeca48e3719ae4263ad42496ebc68b9034953307b5

From 26c47b0acf401dda4ebc9a80610592ae13602107 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 16 Mar 2022 07:57:23 +0100
Subject: [PATCH 199/269] v2.2.9

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index ff4293b..9709295 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    26a587345daa2772bbe2006f13cd9d7f92b242eb
+%global gh_commit    07eccf080ad63d55d95a7c9133506db7d9029264
 %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.8
+%global upstream_version 2.2.9
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -376,6 +376,9 @@ exit $ret
 
 
 %changelog
+* Wed Mar 16 2022 Remi Collet <remi@remirepo.net> - 2.2.9-1
+- update to 2.2.9
+
 * Tue Mar 15 2022 Remi Collet <remi@remirepo.net> - 2.2.8-1
 - update to 2.2.8
 
diff --git a/sources b/sources
index ff11b52..fc8b5f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.8-26a5873.tgz) = ca2dda3c6c17c3b3706626f5411ed2f8205b632d7d9e26a89dc4788f13d9469294a7838bb9fd615013b352aeca48e3719ae4263ad42496ebc68b9034953307b5
+SHA512 (composer-2.2.9-07eccf0.tgz) = e96749a5a77abd6176e8dfc3533c6865a7abe4efa20c51258b5a978151608b9619c9d8c6190a4b7aac23f9a3045b9809cbffe8836ce7325b1f1da3392cb22fc9

From 99e9ef55ce994bf9f3be6ba0f084860d098cf22c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Mar 2022 07:35:16 +0200
Subject: [PATCH 200/269] v2.2.10

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index 9709295..22ba34b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    07eccf080ad63d55d95a7c9133506db7d9029264
+%global gh_commit    18f748df692b6304b5baf077786c003c48e7f990
 %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.9
+%global upstream_version 2.2.10
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -130,7 +130,7 @@ 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.3.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
@@ -376,6 +376,9 @@ exit $ret
 
 
 %changelog
+* Wed Mar 30 2022 Remi Collet <remi@remirepo.net> - 2.2.10-1
+- update to 2.2.10
+
 * Wed Mar 16 2022 Remi Collet <remi@remirepo.net> - 2.2.9-1
 - update to 2.2.9
 
diff --git a/sources b/sources
index fc8b5f7..9cd962e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.9-07eccf0.tgz) = e96749a5a77abd6176e8dfc3533c6865a7abe4efa20c51258b5a978151608b9619c9d8c6190a4b7aac23f9a3045b9809cbffe8836ce7325b1f1da3392cb22fc9
+SHA512 (composer-2.2.10-18f748d.tgz) = 405b94c57ac4d4ee06269a952fd22bc7842bb6917c050987285f789332716d7e6dc84f644a5b85b4b6f6a6657329c28c6bffd012ad9f9314882c0983e29b30c5

From 10827d53755544678073d54195ca6d8db5ea1680 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Mar 2022 13:54:01 +0200
Subject: [PATCH 201/269] update to 2.3.0

always use bundled libraries
  as symfony/* 5.4 and composer/pcre 2 are not available
---
 composer-noxdg.patch |  10 ++--
 composer-rpm.patch   | 114 ++++++++++++++-----------------------------
 composer.spec        |  68 +++++++++++++++-----------
 sources              |   2 +-
 4 files changed, 82 insertions(+), 112 deletions(-)

diff --git a/composer-noxdg.patch b/composer-noxdg.patch
index 607e449..73195e7 100644
--- a/composer-noxdg.patch
+++ b/composer-noxdg.patch
@@ -1,9 +1,9 @@
 diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php
---- ./src/Composer/Factory.php.noxdg	2022-01-25 09:39:15.000000000 +0100
-+++ ./src/Composer/Factory.php	2022-01-25 09:50:21.374957261 +0100
-@@ -701,6 +701,10 @@ class Factory
-      */
-     private static function useXdg()
+--- ./src/Composer/Factory.php.noxdg	2022-03-16 09:51:30.398977729 +0100
++++ ./src/Composer/Factory.php	2022-03-16 09:52:14.113841110 +0100
+@@ -665,6 +665,10 @@ class Factory
+ 
+     private static function useXdg(): bool
      {
 +        // As XDG is very patially implemted
 +        // resulting in command/code in ~/.config
diff --git a/composer-rpm.patch b/composer-rpm.patch
index bdf807b..26ee894 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2022-01-25 09:39:15.000000000 +0100
-+++ ./bin/composer	2022-01-25 09:50:21.372957269 +0100
+--- ./bin/composer.rpm	2022-03-16 09:47:01.000000000 +0100
++++ ./bin/composer	2022-03-16 09:53:25.479618079 +0100
 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
  }
  
@@ -11,10 +11,10 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2022-01-25 09:39:15.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-01-25 09:50:21.373957265 +0100
-@@ -419,7 +419,7 @@ EOF;
-         $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform));
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2022-03-16 09:47:01.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-03-16 09:53:25.479618079 +0100
+@@ -418,7 +418,7 @@ EOF;
+         $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform));
  
          $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
 -        $filesystem->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
@@ -23,9 +23,9 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2022-01-25 09:39:15.000000000 +0100
-+++ ./src/Composer/Compiler.php	2022-01-25 09:50:21.373957265 +0100
-@@ -125,7 +125,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm	2022-03-16 09:47:01.000000000 +0100
++++ ./src/Composer/Compiler.php	2022-03-16 09:53:25.480618076 +0100
+@@ -107,7 +107,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
          $finder->files()
@@ -35,9 +35,9 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
---- ./src/Composer/InstalledVersions.php.rpm	2022-01-25 09:39:15.000000000 +0100
-+++ ./src/Composer/InstalledVersions.php	2022-01-25 09:50:21.373957265 +0100
-@@ -264,7 +264,7 @@ class InstalledVersions
+--- ./src/Composer/InstalledVersions.php.rpm	2022-03-16 09:47:01.000000000 +0100
++++ ./src/Composer/InstalledVersions.php	2022-03-16 09:53:25.480618076 +0100
+@@ -266,7 +266,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
              // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
@@ -46,7 +46,7 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
                  self::$installed = include __DIR__ . '/installed.php';
              } else {
                  self::$installed = array();
-@@ -337,7 +337,7 @@ class InstalledVersions
+@@ -339,7 +339,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
              // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
@@ -56,82 +56,29 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
              } else {
                  self::$installed = array();
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2022-01-25 09:39:15.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2022-01-25 09:50:21.373957265 +0100
-@@ -35,7 +35,7 @@ class JsonFile
-     const JSON_PRETTY_PRINT = 128;
-     const JSON_UNESCAPED_UNICODE = 256;
+--- ./src/Composer/Json/JsonFile.php.rpm	2022-03-16 09:54:28.547422853 +0100
++++ ./src/Composer/Json/JsonFile.php	2022-03-16 09:56:07.126118722 +0100
+@@ -38,7 +38,7 @@ class JsonFile
+     /** @deprecated Use \JSON_UNESCAPED_UNICODE */
+     public const JSON_UNESCAPED_UNICODE = 256;
  
--    const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json';
-+    const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
+-    public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json';
++    public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
  
      /** @var string */
      private $path;
-@@ -197,7 +197,7 @@ class JsonFile
+@@ -200,7 +200,7 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
              $isComposerSchemaFile = true;
--            $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH;
+-            $schemaFile = self::COMPOSER_SCHEMA_PATH;
 +            $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH;
          }
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
-diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-01-25 09:39:15.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-01-25 09:50:21.373957265 +0100
-@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
-     private function check($json)
-     {
-         $validator = new Validator();
--        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json'));
-+        $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
-+        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f));
- 
-         if (!$validator->isValid()) {
-             $errors = $validator->getErrors();
-diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php
---- ./tests/Composer/Test/PolyfillTestCase.php.rpm	2022-01-25 09:39:15.000000000 +0100
-+++ ./tests/Composer/Test/PolyfillTestCase.php	2022-01-25 09:50:21.373957265 +0100
-@@ -15,10 +15,35 @@ namespace Composer\Test {
-     use PHPUnit\Framework\Constraint\LogicalNot;
-     use PHPUnit\Framework\Constraint\StringContains;
- 
--    if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) {
-+    if (method_exists('PHPUnit\Framework\TestCase', 'assertFileDoesNotExist')) {
-         abstract class PolyfillTestCase extends TestCase
-         {
-         }
-+    } else if (method_exists('PHPUnit\Framework\TestCase', 'assertStringContainsString')) {
-+        abstract class PolyfillTestCase extends TestCase {
-+            /**
-+             * @param string $filename
-+             * @param string $message
-+             *
-+             * @return void
-+             */
-+            public static function assertFileDoesNotExist($filename, $message = '')
-+            {
-+                static::assertFileNotExists($filename, $message);
-+            }
-+
-+            /**
-+             * @param string $pattern
-+             * @param string $string
-+             * @param string $message
-+             *
-+             * @return void
-+             */
-+            public static function assertMatchesRegularExpression($pattern, $string, $message = '')
-+            {
-+                static::assertRegExp($pattern, $string, $message);
-+            }
-+        }
-     } else {
-         abstract class PolyfillTestCase extends TestCase
-         {
 diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
---- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2022-01-25 09:50:57.595802751 +0100
-+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-01-25 09:51:36.038638770 +0100
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2021-10-28 22:44:15.000000000 +0200
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-03-16 09:53:25.480618076 +0100
 @@ -125,7 +125,7 @@ class CaBundle
       */
      public static function getBundledCaBundlePath()
@@ -141,3 +88,16 @@ diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Com
  
          // cURL does not understand 'phar://' paths
          // see https://github.com/composer/ca-bundle/issues/10
+diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-03-16 09:47:01.000000000 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-03-16 09:53:25.480618076 +0100
+@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
+     private function check(string $json)
+     {
+         $validator = new Validator();
+-        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json'));
++        $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
++        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f));
+ 
+         if (!$validator->isValid()) {
+             $errors = $validator->getErrors();
diff --git a/composer.spec b/composer.spec
index 22ba34b..a458362 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    18f748df692b6304b5baf077786c003c48e7f990
+%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.10
-#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
 
@@ -66,13 +66,13 @@ 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)
 BuildRequires:  %{symfony_prefix}-console    >= %{symfony_min}
 BuildRequires:  %{symfony_prefix}-finder     >= %{symfony_min}
 BuildRequires:  %{symfony_prefix}-filesystem >= %{symfony_min}
@@ -87,22 +87,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}
@@ -110,13 +112,13 @@ 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)
 Requires:       %{symfony_prefix}-console    >= %{symfony_min}
 Requires:       %{symfony_prefix}-finder     >= %{symfony_min}
 Requires:       %{symfony_prefix}-process    >= %{symfony_min}
@@ -129,7 +131,7 @@ 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-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
@@ -232,8 +234,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',
     ],
@@ -376,6 +381,11 @@ exit $ret
 
 
 %changelog
+* Wed Mar 30 2022 Remi Collet <remi@remirepo.net> - 2.3.0-1
+- update to 2.3.0
+- always use bundled libraries
+  as symfony/* 5.4 and composer/pcre 2 are not available
+
 * Wed Mar 30 2022 Remi Collet <remi@remirepo.net> - 2.2.10-1
 - update to 2.2.10
 
diff --git a/sources b/sources
index 9cd962e..33adfba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.2.10-18f748d.tgz) = 405b94c57ac4d4ee06269a952fd22bc7842bb6917c050987285f789332716d7e6dc84f644a5b85b4b6f6a6657329c28c6bffd012ad9f9314882c0983e29b30c5
+SHA512 (composer-2.3.0-36dc875.tgz) = da303468ed7c6bbf032289f6804480306a4ae0d3a41861bb83506b2c92b8d39c64cb5abd56c8134f047cc74348240696e0993cb12c2901c51d48569d20fca257

From aa563f58c745e850a94fb6778ba30982d7b086d9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 31 Mar 2022 07:50:37 +0200
Subject: [PATCH 202/269] v2.3.2

---
 composer.spec | 7 +++++--
 sources       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index a458362..944335e 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    36dc875e1c6d5ce9411c78aae22b33ac24c86e13
+%global gh_commit    c3777ea50f5ad561d4796b42fba4d180bb45cf77
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.3.0
+%global upstream_version 2.3.2
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -381,6 +381,9 @@ exit $ret
 
 
 %changelog
+* Thu Mar 31 2022 Remi Collet <remi@remirepo.net> - 2.3.2-1
+- update to 2.3.2
+
 * Wed Mar 30 2022 Remi Collet <remi@remirepo.net> - 2.3.0-1
 - update to 2.3.0
 - always use bundled libraries
diff --git a/sources b/sources
index 33adfba..28d0e86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.3.0-36dc875.tgz) = da303468ed7c6bbf032289f6804480306a4ae0d3a41861bb83506b2c92b8d39c64cb5abd56c8134f047cc74348240696e0993cb12c2901c51d48569d20fca257
+SHA512 (composer-2.3.2-c3777ea.tgz) = d86dfd652e4fe7f67763c0e8bdc927954081310813fa92094261afdf7fbd63f84a241a8a4def6c1e1fedaabd40638f4be34d960940904cf2a01c2dcf26315248

From eff5be53fb68eb005dcced158f8c87f0b858181a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 4 Apr 2022 08:14:48 +0200
Subject: [PATCH 203/269] v2.3.3

---
 composer.spec | 11 +++++++----
 sources       |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer.spec b/composer.spec
index 944335e..0496750 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    c3777ea50f5ad561d4796b42fba4d180bb45cf77
+%global gh_commit    b0024890b8650e52d1a29822856b3c95aa393785
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.3.2
+%global upstream_version 2.3.3
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -132,14 +132,14 @@ 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) = 2.0.0
-Provides:       bundled(php-composer-semver) = 3.3.1
+Provides:       bundled(php-composer-semver) = 3.3.2
 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
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v2.9.0
-Provides:       bundled(php-seld-jsonlint) = 1.8.3
+Provides:       bundled(php-seld-jsonlint) = 1.9.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.0
 Provides:       bundled(php-symfony-console) = v5.4.5
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.0
@@ -381,6 +381,9 @@ exit $ret
 
 
 %changelog
+* Sat Apr  2 2022 Remi Collet <remi@remirepo.net> - 2.3.3-1
+- update to 2.3.3
+
 * Thu Mar 31 2022 Remi Collet <remi@remirepo.net> - 2.3.2-1
 - update to 2.3.2
 
diff --git a/sources b/sources
index 28d0e86..50cfe3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.3.2-c3777ea.tgz) = d86dfd652e4fe7f67763c0e8bdc927954081310813fa92094261afdf7fbd63f84a241a8a4def6c1e1fedaabd40638f4be34d960940904cf2a01c2dcf26315248
+SHA512 (composer-2.3.3-b002489.tgz) = 2e4d88a6a8a7561847d9f81a1aa2cede467591250e50a1208502e2d708d5165432d3ab1cf4cd9a15f30f882092727d545fa8deaae97d079500c85ad1c70b2e07

From aaad9a1ed5d95d238d6134789041947ec7ef767a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 11 Apr 2022 07:58:02 +0200
Subject: [PATCH 204/269] v2.3.4

---
 composer.spec | 17 ++++++++++-------
 sources       |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/composer.spec b/composer.spec
index 0496750..e61d6ac 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    b0024890b8650e52d1a29822856b3c95aa393785
+%global gh_commit    b7a041319947872c4352aa8139f4b4d6dea7130f
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.3.3
+%global upstream_version 2.3.4
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -141,9 +141,9 @@ Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v2.9.0
 Provides:       bundled(php-seld-jsonlint) = 1.9.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.0
-Provides:       bundled(php-symfony-console) = v5.4.5
-Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.0
-Provides:       bundled(php-symfony-filesystem) = v5.4.6
+Provides:       bundled(php-symfony-console) = v5.4.7
+Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.1
+Provides:       bundled(php-symfony-filesystem) = v5.4.7
 Provides:       bundled(php-symfony-finder) = v5.4.3
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.25.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0
@@ -151,8 +151,8 @@ Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.25.0
 Provides:       bundled(php-symfony-polyfill-mbstring) = v1.25.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.25.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.25.0
-Provides:       bundled(php-symfony-process) = v5.4.5
-Provides:       bundled(php-symfony-service-contracts) = v2.5.0
+Provides:       bundled(php-symfony-process) = v5.4.7
+Provides:       bundled(php-symfony-service-contracts) = v2.5.1
 Provides:       bundled(php-symfony-string) = v5.4.3
 %endif
 # From composer.json, suggest
@@ -381,6 +381,9 @@ exit $ret
 
 
 %changelog
+* Fri Apr  8 2022 Remi Collet <remi@remirepo.net> - 2.3.4-1
+- update to 2.3.4
+
 * Sat Apr  2 2022 Remi Collet <remi@remirepo.net> - 2.3.3-1
 - update to 2.3.3
 
diff --git a/sources b/sources
index 50cfe3d..120f05c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.3.3-b002489.tgz) = 2e4d88a6a8a7561847d9f81a1aa2cede467591250e50a1208502e2d708d5165432d3ab1cf4cd9a15f30f882092727d545fa8deaae97d079500c85ad1c70b2e07
+SHA512 (composer-2.3.4-b7a0413.tgz) = 8d9d68511f06c090f6a512d1efdf042c02b3ccb5431c2feb270735e29c80b39f2bb4bc88347eac1e75b2331ac13efaa99e06dffd7bc6949a209dddfaeb591ec1

From 88b1b19ddced8596339bf112129bdf3b6bad14c9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 14 Apr 2022 07:13:08 +0200
Subject: [PATCH 205/269] v1.10.26

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index ed5239b..b4df0a7 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2021 Remi Collet
+# Copyright (c) 2015-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    28c9dfbe2351635961f670773e8d7b17bc5eda25
+%global gh_commit    3e196135eacf9e519a6b00986bc6fe6aff977997
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.22
+%global upstream_version 1.10.26
 #global upstream_prever  RC
 
 %if 0
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Thu Apr 14 2022 Remi Collet <remi@remirepo.net> - 1.10.26-1
+- update to 1.10.26
+
 * Tue Apr 27 2021 Remi Collet <remi@remirepo.net> - 1.10.22-1
 - update to 1.10.22
 
diff --git a/sources b/sources
index c51b7a7..3ac7510 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.22-28c9dfb.tgz) = a5508789019530f6f9e6207bad005e37f35923b7286c655fdc1fe485e01a26ce4018f84c803a40b6b1b52c93fd394d61192a75febef7d6756df102d4dc2139ee
+SHA512 (composer-1.10.26-3e19613.tgz) = abe1cadba212859433e019d83ac7b21d491ae81e6484a67feaf89bd6b87d8a22184425f12b6d5f39ac68569608ba1bb91043cfce7e99e1b8e702a27fa4504fb4

From ac236cf433188d9d75b4f2a2ef85e3a6ca277c00 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 14 Apr 2022 07:24:37 +0200
Subject: [PATCH 206/269] v2.3.5

---
 composer.spec | 9 ++++++---
 sources       | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer.spec b/composer.spec
index e61d6ac..22a64f4 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    b7a041319947872c4352aa8139f4b4d6dea7130f
+%global gh_commit    50c47b1f907cfcdb8f072b88164d22b527557ae1
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.3.4
+%global upstream_version 2.3.5
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -135,7 +135,7 @@ Provides:       bundled(php-composer-pcre) = 2.0.0
 Provides:       bundled(php-composer-semver) = 3.3.2
 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
+Provides:       bundled(php-justinrainbow-json-schema) = 5.2.12
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v2.9.0
@@ -381,6 +381,9 @@ exit $ret
 
 
 %changelog
+* Thu Apr 14 2022 Remi Collet <remi@remirepo.net> - 2.3.5-1
+- update to 2.3.5
+
 * Fri Apr  8 2022 Remi Collet <remi@remirepo.net> - 2.3.4-1
 - update to 2.3.4
 
diff --git a/sources b/sources
index 120f05c..121a896 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.3.4-b7a0413.tgz) = 8d9d68511f06c090f6a512d1efdf042c02b3ccb5431c2feb270735e29c80b39f2bb4bc88347eac1e75b2331ac13efaa99e06dffd7bc6949a209dddfaeb591ec1
+SHA512 (composer-2.3.5-50c47b1.tgz) = 9043ff987a122d7f820a7e18d00d09102253e8d9e056503df766e58382ee39ef2b016753f9ec9601f78202e8b6553e3b9117ddabbb1a83414972090704eb68f4

From 47a00de7039a50b759ad450170714b49d0fbbdae Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 2 Jun 2022 07:10:29 +0200
Subject: [PATCH 207/269] v2.3.6

---
 composer.spec | 35 +++++++++++++++++++++--------------
 sources       |  2 +-
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/composer.spec b/composer.spec
index 22a64f4..093a47c 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    50c47b1f907cfcdb8f072b88164d22b527557ae1
+%global gh_commit    0f43aa1652c447a6bc7c9217ec133313b1d32e72
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.3.5
+%global upstream_version 2.3.6
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -129,11 +129,12 @@ Requires:       php-composer(fedora/autoloader)
 # System certificates
 Requires:       ca-certificates
 # Bundled libraries
-Provides:       bundled(php-composer-ca-bundle) = 1.3.1
+# License MIT
+Provides:       bundled(php-composer-ca-bundle) = 1.3.2
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.0.0
 Provides:       bundled(php-composer-semver) = 3.3.2
-Provides:       bundled(php-composer-spdx-licenses) = 1.5.6
+Provides:       bundled(php-composer-spdx-licenses) = 1.5.7
 Provides:       bundled(php-composer-xdebug-handler) = 3.0.3
 Provides:       bundled(php-justinrainbow-json-schema) = 5.2.12
 Provides:       bundled(php-psr-container) = 1.1.1
@@ -141,19 +142,19 @@ Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v2.9.0
 Provides:       bundled(php-seld-jsonlint) = 1.9.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.0
-Provides:       bundled(php-symfony-console) = v5.4.7
+Provides:       bundled(php-symfony-console) = v5.4.9
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.1
-Provides:       bundled(php-symfony-filesystem) = v5.4.7
-Provides:       bundled(php-symfony-finder) = v5.4.3
+Provides:       bundled(php-symfony-filesystem) = v5.4.9
+Provides:       bundled(php-symfony-finder) = v5.4.8
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.25.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0
 Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.25.0
 Provides:       bundled(php-symfony-polyfill-mbstring) = v1.25.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.25.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.25.0
-Provides:       bundled(php-symfony-process) = v5.4.7
+Provides:       bundled(php-symfony-process) = v5.4.8
 Provides:       bundled(php-symfony-service-contracts) = v2.5.1
-Provides:       bundled(php-symfony-string) = v5.4.3
+Provides:       bundled(php-symfony-string) = v5.4.9
 %endif
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -268,13 +269,16 @@ php -r '
         echo "cant decode json file\n";
 		exit(3);
 	}
-	$lic = [];
+	$res = [];
     foreach($pkgs["packages"] as $pkg) {
-        printf("Provides:       bundled(php-%s) = %s\n", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]);
-        $lic = array_merge($lic, $pkg["license"]);
+		$lic = implode(" and ", $pkg["license"]);
+		if (!isset($res[$lic])) $res[$lic] = [];
+		$res[$lic][] = sprintf("Provides:       bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]);
+	}
+	foreach($res as $lic => $lib) {
+		sort($lib);
+		printf("# License %s\n%s\n", $lic, implode("\n", $lib));
 	}
-	sort($lic);
-	printf("\nLicense: %s\n\n", implode(" and ", array_unique($lic)));
 '
 %endif
 
@@ -381,6 +385,9 @@ exit $ret
 
 
 %changelog
+* Thu Jun  2 2022 Remi Collet <remi@remirepo.net> - 2.3.6-1
+- update to 2.3.6
+
 * Thu Apr 14 2022 Remi Collet <remi@remirepo.net> - 2.3.5-1
 - update to 2.3.5
 
diff --git a/sources b/sources
index 121a896..9c604a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.3.5-50c47b1.tgz) = 9043ff987a122d7f820a7e18d00d09102253e8d9e056503df766e58382ee39ef2b016753f9ec9601f78202e8b6553e3b9117ddabbb1a83414972090704eb68f4
+SHA512 (composer-2.3.6-0f43aa1.tgz) = 79f3cb8b0b67efce643e2e4c6d452d6e39892463e7808e7cb756a51a26263b818b57b0938b6881d706928fbb65dbaa7b3bada58a314f8bc96715a547084c2b46

From 2f15f97b4402fa2d1ac969d8bda1f31e62cbcc22 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 2 Jun 2022 07:14:47 +0200
Subject: [PATCH 208/269] refresh patch

---
 composer-rpm.patch | 48 +++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 26ee894..5cfb149 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,7 +1,7 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2022-03-16 09:47:01.000000000 +0100
-+++ ./bin/composer	2022-03-16 09:53:25.479618079 +0100
-@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== '
+--- ./bin/composer.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./bin/composer	2022-06-02 06:49:45.037192985 +0200
+@@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) {
  }
  
  setlocale(LC_ALL, 'C');
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2022-03-16 09:47:01.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-03-16 09:53:25.479618079 +0100
-@@ -418,7 +418,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-06-02 06:49:45.037192985 +0200
+@@ -425,7 +425,7 @@ EOF;
          $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform));
  
          $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2022-03-16 09:47:01.000000000 +0100
-+++ ./src/Composer/Compiler.php	2022-03-16 09:53:25.480618076 +0100
+--- ./src/Composer/Compiler.php.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/Compiler.php	2022-06-02 06:49:45.037192985 +0200
 @@ -107,7 +107,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
---- ./src/Composer/InstalledVersions.php.rpm	2022-03-16 09:47:01.000000000 +0100
-+++ ./src/Composer/InstalledVersions.php	2022-03-16 09:53:25.480618076 +0100
+--- ./src/Composer/InstalledVersions.php.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/InstalledVersions.php	2022-06-02 06:49:45.037192985 +0200
 @@ -266,7 +266,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
@@ -56,9 +56,9 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
              } else {
                  self::$installed = array();
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2022-03-16 09:54:28.547422853 +0100
-+++ ./src/Composer/Json/JsonFile.php	2022-03-16 09:56:07.126118722 +0100
-@@ -38,7 +38,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2022-06-02 06:49:45.037192985 +0200
+@@ -39,7 +39,7 @@ class JsonFile
      /** @deprecated Use \JSON_UNESCAPED_UNICODE */
      public const JSON_UNESCAPED_UNICODE = 256;
  
@@ -67,7 +67,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      /** @var string */
      private $path;
-@@ -200,7 +200,7 @@ class JsonFile
+@@ -219,7 +219,7 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
              $isComposerSchemaFile = true;
@@ -76,9 +76,21 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          }
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
+diff -up ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm ./src/Composer/PHPStan/ConfigReturnTypeExtension.php
+--- ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm	2022-06-02 06:50:28.987916014 +0200
++++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php	2022-06-02 06:51:05.429709332 +0200
+@@ -30,7 +30,7 @@ final class ConfigReturnTypeExtension im
+ 
+     public function __construct()
+     {
+-        $schema = JsonFile::parseJson((string) file_get_contents(__DIR__.'/../../../res/composer-schema.json'));
++        $schema = JsonFile::parseJson((string) file_get_contents('/usr/share/composer/res/composer-schema.json'));
+         /**
+          * @var string $prop
+          */
 diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
---- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2021-10-28 22:44:15.000000000 +0200
-+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-03-16 09:53:25.480618076 +0100
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2022-05-24 13:56:16.000000000 +0200
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-06-02 06:49:45.037192985 +0200
 @@ -125,7 +125,7 @@ class CaBundle
       */
      public static function getBundledCaBundlePath()
@@ -89,8 +101,8 @@ diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Com
          // cURL does not understand 'phar://' paths
          // see https://github.com/composer/ca-bundle/issues/10
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-03-16 09:47:01.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-03-16 09:53:25.480618076 +0100
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-06-02 06:47:42.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-06-02 06:49:45.037192985 +0200
 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
      private function check(string $json)
      {

From d6eab73de5f824170a7735465b3b37b9ba3406b5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 7 Jun 2022 07:00:41 +0200
Subject: [PATCH 209/269] v2.3.7

---
 composer.spec | 19 +++++++++++--------
 sources       |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/composer.spec b/composer.spec
index 093a47c..1ca8a03 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    0f43aa1652c447a6bc7c9217ec133313b1d32e72
+%global gh_commit    10cd375cf85dede2ff417ceab517ef9a0dc55407
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.3.6
+%global upstream_version 2.3.7
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -146,12 +146,12 @@ Provides:       bundled(php-symfony-console) = v5.4.9
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.1
 Provides:       bundled(php-symfony-filesystem) = v5.4.9
 Provides:       bundled(php-symfony-finder) = v5.4.8
-Provides:       bundled(php-symfony-polyfill-ctype) = v1.25.0
-Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.25.0
-Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.25.0
-Provides:       bundled(php-symfony-polyfill-mbstring) = v1.25.0
-Provides:       bundled(php-symfony-polyfill-php73) = v1.25.0
-Provides:       bundled(php-symfony-polyfill-php80) = v1.25.0
+Provides:       bundled(php-symfony-polyfill-ctype) = v1.26.0
+Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0
+Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0
+Provides:       bundled(php-symfony-polyfill-mbstring) = v1.26.0
+Provides:       bundled(php-symfony-polyfill-php73) = v1.26.0
+Provides:       bundled(php-symfony-polyfill-php80) = v1.26.0
 Provides:       bundled(php-symfony-process) = v5.4.8
 Provides:       bundled(php-symfony-service-contracts) = v2.5.1
 Provides:       bundled(php-symfony-string) = v5.4.9
@@ -385,6 +385,9 @@ exit $ret
 
 
 %changelog
+* Tue Jun  7 2022 Remi Collet <remi@remirepo.net> - 2.3.7-1
+- update to 2.3.7
+
 * Thu Jun  2 2022 Remi Collet <remi@remirepo.net> - 2.3.6-1
 - update to 2.3.6
 
diff --git a/sources b/sources
index 9c604a3..9162311 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.3.6-0f43aa1.tgz) = 79f3cb8b0b67efce643e2e4c6d452d6e39892463e7808e7cb756a51a26263b818b57b0938b6881d706928fbb65dbaa7b3bada58a314f8bc96715a547084c2b46
+SHA512 (composer-2.3.7-10cd375.tgz) = 7b260d2d54c02c421d3e229128f4004a9a06fb43b5c3ec7251aa77618575192a3b471e84b80777cd6a6111936ad115ea25a3c0018c4f59c0c0c03c316b8ac5bb

From 6a0116f61bb2118dce9cb15c802ad088d77aa8ee Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 1 Jul 2022 14:05:08 +0200
Subject: [PATCH 210/269] update to 2.3.8

add bash completion file (for upcoming 2.4)
---
 composer-bash-completion | 81 ++++++++++++++++++++++++++++++++++++++++
 composer.spec            | 23 +++++++++---
 sources                  |  2 +-
 3 files changed, 99 insertions(+), 7 deletions(-)
 create mode 100644 composer-bash-completion

diff --git a/composer-bash-completion b/composer-bash-completion
new file mode 100644
index 0000000..f24f512
--- /dev/null
+++ b/composer-bash-completion
@@ -0,0 +1,81 @@
+# This file is part of the Symfony package.
+#
+# (c) Fabien Potencier <fabien@symfony.com>
+#
+# For the full copyright and license information, please view
+# https://symfony.com/doc/current/contributing/code/license.html
+
+_sf_composer() {
+    # Use newline as only separator to allow space in completion values
+    IFS=$'\n'
+    local sf_cmd="${COMP_WORDS[0]}"
+
+    # for an alias, get the real script behind it
+    if [[ $(type -t $sf_cmd) == "alias" ]]; then
+        sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/")
+    fi
+
+    if [ ! -f "$sf_cmd" ]; then
+        return 1
+    fi
+
+    local cur prev words cword
+    _get_comp_words_by_ref -n := cur prev words cword
+
+    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.8")
+    for w in ${words[@]}; do
+        w=$(printf -- '%b' "$w")
+        # remove quotes from typed values
+        quote="${w:0:1}"
+        if [ "$quote" == \' ]; then
+            w="${w%\'}"
+            w="${w#\'}"
+        elif [ "$quote" == \" ]; then
+            w="${w%\"}"
+            w="${w#\"}"
+        fi
+        # empty values are ignored
+        if [ ! -z "$w" ]; then
+            completecmd+=("-i$w")
+        fi
+    done
+
+    local sfcomplete
+    if sfcomplete=$(${completecmd[@]} 2>&1); then
+        local quote suggestions
+        quote=${cur:0:1}
+
+        # Use single quotes by default if suggestions contains backslash (FQCN)
+        if [ "$quote" == '' ] && [[ "$sfcomplete" =~ \\ ]]; then
+            quote=\'
+        fi
+
+        if [ "$quote" == \' ]; then
+            # single quotes: no additional escaping (does not accept ' in values)
+            suggestions=$(for s in $sfcomplete; do printf $'%q%q%q\n' "$quote" "$s" "$quote"; done)
+        elif [ "$quote" == \" ]; then
+            # double quotes: double escaping for \ $ ` "
+            suggestions=$(for s in $sfcomplete; do
+                s=${s//\\/\\\\}
+                s=${s//\$/\\\$}
+                s=${s//\`/\\\`}
+                s=${s//\"/\\\"}
+                printf $'%q%q%q\n' "$quote" "$s" "$quote";
+            done)
+        else
+            # no quotes: double escaping
+            suggestions=$(for s in $sfcomplete; do printf $'%q\n' $(printf '%q' "$s"); done)
+        fi
+        COMPREPLY=($(IFS=$'\n' compgen -W "$suggestions" -- $(printf -- "%q" "$cur")))
+        __ltrim_colon_completions "$cur"
+    else
+        if [[ "$sfcomplete" != *"Command \"_complete\" is not defined."* ]]; then
+            >&2 echo
+            >&2 echo $sfcomplete
+        fi
+
+        return 1
+    fi
+}
+
+complete -F _sf_composer composer
diff --git a/composer.spec b/composer.spec
index 1ca8a03..a100a10 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    10cd375cf85dede2ff417ceab517ef9a0dc55407
+%global gh_commit    f69e63262dadd02b3b6edade339c7badda2939c2
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.3.7
+%global upstream_version 2.3.8
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -35,6 +35,9 @@
 %global symfony_min    5.4.1
 
 %global _phpunit       %{_bindir}/phpunit9
+%global bashcompdir    %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
+%global bashcomproot   %(dirname %{bashcompdir} 2>/dev/null)
+
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
@@ -46,6 +49,7 @@ License:        MIT
 URL:            https://getcomposer.org/
 Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
 # Profile scripts
+Source1:        %{name}-bash-completion
 Source3:        %{name}.sh
 Source4:        %{name}.csh
 # Get a git snapshot to retrieve the test suite
@@ -61,6 +65,7 @@ BuildArch:      noarch
 BuildRequires:  php(language) >= 7.2.5
 BuildRequires:  php-cli
 BuildRequires:  php-json
+BuildRequires:  pkgconfig(bash-completion)
 %if %{with tests}
 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)
@@ -142,8 +147,8 @@ Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v2.9.0
 Provides:       bundled(php-seld-jsonlint) = 1.9.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.0
-Provides:       bundled(php-symfony-console) = v5.4.9
-Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.1
+Provides:       bundled(php-symfony-console) = v5.4.10
+Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
 Provides:       bundled(php-symfony-filesystem) = v5.4.9
 Provides:       bundled(php-symfony-finder) = v5.4.8
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.26.0
@@ -153,8 +158,8 @@ Provides:       bundled(php-symfony-polyfill-mbstring) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.26.0
 Provides:       bundled(php-symfony-process) = v5.4.8
-Provides:       bundled(php-symfony-service-contracts) = v2.5.1
-Provides:       bundled(php-symfony-string) = v5.4.9
+Provides:       bundled(php-symfony-service-contracts) = v2.5.2
+Provides:       bundled(php-symfony-string) = v5.4.10
 %endif
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -315,6 +320,7 @@ if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) {
 
 %install
 : Profile scripts
+install -Dpm 644 %{SOURCE1} %{buildroot}%{bashcompdir}/%{name}
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/
 
@@ -382,9 +388,14 @@ exit $ret
 %{_bindir}/%{name}
 %{_datadir}/php/Composer
 %{_datadir}/%{name}
+%{bashcomproot}
 
 
 %changelog
+* Fri Jul  1 2022 Remi Collet <remi@remirepo.net> - 2.3.8-1
+- update to 2.3.8
+- add bash completion file (for upcoming 2.4)
+
 * Tue Jun  7 2022 Remi Collet <remi@remirepo.net> - 2.3.7-1
 - update to 2.3.7
 
diff --git a/sources b/sources
index 9162311..bcadacc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.3.7-10cd375.tgz) = 7b260d2d54c02c421d3e229128f4004a9a06fb43b5c3ec7251aa77618575192a3b471e84b80777cd6a6111936ad115ea25a3c0018c4f59c0c0c03c316b8ac5bb
+SHA512 (composer-2.3.8-f69e632.tgz) = 1a06aecceb68863b283fd2d8cb9f0e85702c491b0ac7719ef36f4b12a7040c4f92506d2414f6ff7a38d14120f7ff06ae871d57676623ba86f20d9b377f4dd828

From c3d8b5a6ffe6b54b5507705344963668efa1859b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 5 Jul 2022 17:47:15 +0200
Subject: [PATCH 211/269] v2.3.9

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index f24f512..e534faf 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -22,7 +22,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.8")
+    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.9")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index a100a10..58cebcb 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    f69e63262dadd02b3b6edade339c7badda2939c2
+%global gh_commit    015f524c9969255a29cdea8890cbd4fec240ee47
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.3.8
+%global upstream_version 2.3.9
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -392,6 +392,9 @@ exit $ret
 
 
 %changelog
+* Tue Jul  5 2022 Remi Collet <remi@remirepo.net> - 2.3.9-1
+- update to 2.3.9
+
 * Fri Jul  1 2022 Remi Collet <remi@remirepo.net> - 2.3.8-1
 - update to 2.3.8
 - add bash completion file (for upcoming 2.4)
diff --git a/sources b/sources
index bcadacc..1cd526d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.3.8-f69e632.tgz) = 1a06aecceb68863b283fd2d8cb9f0e85702c491b0ac7719ef36f4b12a7040c4f92506d2414f6ff7a38d14120f7ff06ae871d57676623ba86f20d9b377f4dd828
+SHA512 (composer-2.3.9-015f524.tgz) = ecbbdf518326c512ceef1649374ab99b609e461a1dee140474615d4efd523bb77d0eed0b52af22bc666356a8c399e2350d015a31ebe8fb6ab7271bce40fe7c16

From 8e2a752dada81fff679a2eade745330f6cbf1c6c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 18 Jul 2022 08:06:21 +0200
Subject: [PATCH 212/269] v2.3.10

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index e534faf..5d484cc 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -22,7 +22,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.9")
+    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.10")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 58cebcb..b252516 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    015f524c9969255a29cdea8890cbd4fec240ee47
+%global gh_commit    ebac357c0a41359f3981098729042ed6dedc97ba
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.3.9
+%global upstream_version 2.3.10
 #global upstream_prever  RC2
 #global upstream_lower   rc2
 
@@ -392,6 +392,9 @@ exit $ret
 
 
 %changelog
+* Thu Jul 14 2022 Remi Collet <remi@remirepo.net> - 2.3.10-1
+- update to 2.3.10
+
 * Tue Jul  5 2022 Remi Collet <remi@remirepo.net> - 2.3.9-1
 - update to 2.3.9
 
diff --git a/sources b/sources
index 1cd526d..038e012 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.3.9-015f524.tgz) = ecbbdf518326c512ceef1649374ab99b609e461a1dee140474615d4efd523bb77d0eed0b52af22bc666356a8c399e2350d015a31ebe8fb6ab7271bce40fe7c16
+SHA512 (composer-2.3.10-ebac357.tgz) = 22302bfb5bb03f87567eda1fcfe906b049d43ff43862472405d13f6af472b1452834d09cb944753b740950c2d98911e6af72bb7b771c048a26cdb165b0c73659

From 14a0ac923c2c0928b48e79f943d1cb3d233bbab4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 23:27:32 +0000
Subject: [PATCH 213/269] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index b252516..ffdfbd6 100644
--- a/composer.spec
+++ b/composer.spec
@@ -41,7 +41,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 # composer and all dependencies are MIT
@@ -392,6 +392,9 @@ exit $ret
 
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Jul 14 2022 Remi Collet <remi@remirepo.net> - 2.3.10-1
 - update to 2.3.10
 

From 6384f21cf8f25ed9b1a5e4c4fa94ab63bd03b2fa Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 16 Aug 2022 16:56:14 +0200
Subject: [PATCH 214/269] v2.4.0

---
 composer-bash-completion |  6 ++++--
 composer.spec            | 27 ++++++++++++++++-----------
 sources                  |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 5d484cc..713cb2f 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -13,16 +13,18 @@ _sf_composer() {
     # for an alias, get the real script behind it
     if [[ $(type -t $sf_cmd) == "alias" ]]; then
         sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/")
+    else
+        sf_cmd=$(type -p $sf_cmd)
     fi
 
-    if [ ! -f "$sf_cmd" ]; then
+    if [ ! -x "$sf_cmd" ]; then
         return 1
     fi
 
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.3.10")
+    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.0")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index ffdfbd6..44a1cd5 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    ebac357c0a41359f3981098729042ed6dedc97ba
+%global gh_commit    026d6de6ea2c913974a7756661a3faac135cb36e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -26,9 +26,9 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.3.10
-#global upstream_prever  RC2
-#global upstream_lower   rc2
+%global upstream_version 2.4.0
+#global upstream_prever  RC1
+#global upstream_lower   rc1
 
 %global symfony_prefix php-symfony5
 %global symfony_path   %{_datadir}/php/Symfony5
@@ -41,7 +41,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
@@ -135,7 +135,8 @@ Requires:       php-composer(fedora/autoloader)
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.3.2
+Provides:       bundled(php-composer-ca-bundle) = 1.3.3
+Provides:       bundled(php-composer-class-map-generator) = 1.0.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.0.0
 Provides:       bundled(php-composer-semver) = 3.3.2
@@ -147,19 +148,20 @@ Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v2.9.0
 Provides:       bundled(php-seld-jsonlint) = 1.9.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.0
-Provides:       bundled(php-symfony-console) = v5.4.10
+Provides:       bundled(php-seld-signal-handler) = 2.0.1
+Provides:       bundled(php-symfony-console) = v5.4.11
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:       bundled(php-symfony-filesystem) = v5.4.9
-Provides:       bundled(php-symfony-finder) = v5.4.8
+Provides:       bundled(php-symfony-filesystem) = v5.4.11
+Provides:       bundled(php-symfony-finder) = v5.4.11
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-mbstring) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.26.0
-Provides:       bundled(php-symfony-process) = v5.4.8
+Provides:       bundled(php-symfony-process) = v5.4.11
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.10
+Provides:       bundled(php-symfony-string) = v5.4.11
 %endif
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -392,6 +394,9 @@ exit $ret
 
 
 %changelog
+* Tue Aug 16 2022 Remi Collet <remi@remirepo.net> - 2.4.0-1
+- update to 2.4.0
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 038e012..b2cfab4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.3.10-ebac357.tgz) = 22302bfb5bb03f87567eda1fcfe906b049d43ff43862472405d13f6af472b1452834d09cb944753b740950c2d98911e6af72bb7b771c048a26cdb165b0c73659
+SHA512 (composer-2.4.0-026d6de.tgz) = 211f756843980a5935f03c544086a3045f323c983dfd7aaa2630f0c4c6db8d60de60de6f928a97d360a83c82f62afcfbc7ea13aaf44a673f0bb186b007e44529

From fc3013e4b46f39bd31c7d26a99a7700681e94573 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 8 Sep 2022 10:31:49 +0200
Subject: [PATCH 215/269] v2.4.1

---
 composer-bash-completion |  2 +-
 composer.spec            | 13 ++++++++-----
 sources                  |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 713cb2f..4aed20f 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -24,7 +24,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.0")
+    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.1")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 44a1cd5..87ecfe6 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    026d6de6ea2c913974a7756661a3faac135cb36e
+%global gh_commit    777d542e3af65f8e7a66a4d98ce7a697da339414
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.4.0
+%global upstream_version 2.4.1
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -149,9 +149,9 @@ Provides:       bundled(php-react-promise) = v2.9.0
 Provides:       bundled(php-seld-jsonlint) = 1.9.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.0
 Provides:       bundled(php-seld-signal-handler) = 2.0.1
-Provides:       bundled(php-symfony-console) = v5.4.11
+Provides:       bundled(php-symfony-console) = v5.4.12
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:       bundled(php-symfony-filesystem) = v5.4.11
+Provides:       bundled(php-symfony-filesystem) = v5.4.12
 Provides:       bundled(php-symfony-finder) = v5.4.11
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0
@@ -161,7 +161,7 @@ Provides:       bundled(php-symfony-polyfill-php73) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.26.0
 Provides:       bundled(php-symfony-process) = v5.4.11
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.11
+Provides:       bundled(php-symfony-string) = v5.4.12
 %endif
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -394,6 +394,9 @@ exit $ret
 
 
 %changelog
+* Mon Aug 29 2022 Remi Collet <remi@remirepo.net> - 2.4.1-1
+- update to 2.4.1
+
 * Tue Aug 16 2022 Remi Collet <remi@remirepo.net> - 2.4.0-1
 - update to 2.4.0
 
diff --git a/sources b/sources
index b2cfab4..2502211 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.4.0-026d6de.tgz) = 211f756843980a5935f03c544086a3045f323c983dfd7aaa2630f0c4c6db8d60de60de6f928a97d360a83c82f62afcfbc7ea13aaf44a673f0bb186b007e44529
+SHA512 (composer-2.4.1-777d542.tgz) = 64b3f4d729af225004351c9a5cbb4c763f127b25af7e5b7961bd2db1051b1656bef3f42c3f9d359d030d674a8de908b78b98230a3ada9820c8c6794bfdc90b85

From a234b22f2d347aca63eaae88699b202048a78cea Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 8 Sep 2022 10:32:36 +0200
Subject: [PATCH 216/269] refresh patch for 2.4.1

---
 composer-rpm.patch | 48 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index 5cfb149..224503a 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2022-06-02 06:47:42.000000000 +0200
-+++ ./bin/composer	2022-06-02 06:49:45.037192985 +0200
+--- ./bin/composer.rpm	2022-08-29 07:36:37.000000000 +0200
++++ ./bin/composer	2022-08-29 07:36:45.053967617 +0200
 @@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) {
  }
  
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2022-06-02 06:47:42.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-06-02 06:49:45.037192985 +0200
-@@ -425,7 +425,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2022-08-29 07:36:45.053967617 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-08-29 07:38:03.936134475 +0200
+@@ -431,7 +431,7 @@ EOF;
          $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform));
  
          $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -21,11 +21,11 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
 +        $filesystem->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE');
  
          if ($this->runScripts) {
-             $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
+             $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, [], [
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2022-06-02 06:47:42.000000000 +0200
-+++ ./src/Composer/Compiler.php	2022-06-02 06:49:45.037192985 +0200
-@@ -107,7 +107,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm	2022-08-29 07:36:37.000000000 +0200
++++ ./src/Composer/Compiler.php	2022-08-29 07:36:45.053967617 +0200
+@@ -106,7 +106,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
---- ./src/Composer/InstalledVersions.php.rpm	2022-06-02 06:47:42.000000000 +0200
-+++ ./src/Composer/InstalledVersions.php	2022-06-02 06:49:45.037192985 +0200
+--- ./src/Composer/InstalledVersions.php.rpm	2022-08-29 07:36:37.000000000 +0200
++++ ./src/Composer/InstalledVersions.php	2022-08-29 07:36:45.053967617 +0200
 @@ -266,7 +266,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
@@ -56,8 +56,8 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
              } else {
                  self::$installed = array();
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2022-06-02 06:47:42.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2022-06-02 06:49:45.037192985 +0200
+--- ./src/Composer/Json/JsonFile.php.rpm	2022-08-29 07:36:37.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2022-08-29 07:36:45.053967617 +0200
 @@ -39,7 +39,7 @@ class JsonFile
      /** @deprecated Use \JSON_UNESCAPED_UNICODE */
      public const JSON_UNESCAPED_UNICODE = 256;
@@ -67,7 +67,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      /** @var string */
      private $path;
-@@ -219,7 +219,7 @@ class JsonFile
+@@ -216,7 +216,7 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
              $isComposerSchemaFile = true;
@@ -77,9 +77,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm ./src/Composer/PHPStan/ConfigReturnTypeExtension.php
---- ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm	2022-06-02 06:50:28.987916014 +0200
-+++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php	2022-06-02 06:51:05.429709332 +0200
-@@ -30,7 +30,7 @@ final class ConfigReturnTypeExtension im
+--- ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm	2022-08-29 07:36:37.000000000 +0200
++++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php	2022-08-29 07:36:45.054967614 +0200
+@@ -39,7 +39,7 @@ final class ConfigReturnTypeExtension im
  
      public function __construct()
      {
@@ -89,8 +89,8 @@ diff -up ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm ./src/Composer
           * @var string $prop
           */
 diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
---- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2022-05-24 13:56:16.000000000 +0200
-+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-06-02 06:49:45.037192985 +0200
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2022-07-20 09:14:26.000000000 +0200
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-08-29 07:36:45.054967614 +0200
 @@ -125,7 +125,7 @@ class CaBundle
       */
      public static function getBundledCaBundlePath()
@@ -101,15 +101,15 @@ diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Com
          // cURL does not understand 'phar://' paths
          // see https://github.com/composer/ca-bundle/issues/10
 diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-06-02 06:47:42.000000000 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-06-02 06:49:45.037192985 +0200
-@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-08-29 07:36:45.054967614 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-08-29 07:39:34.814922582 +0200
+@@ -96,7 +96,8 @@ class ComposerSchemaTest extends TestCas
      private function check(string $json)
      {
          $validator = new Validator();
--        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json'));
+-        $validator->check(json_decode($json), (object) ['$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json']);
 +        $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
-+        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f));
++        $validator->check(json_decode($json), (object) ['$ref' => 'file://' . $f]);
  
          if (!$validator->isValid()) {
              $errors = $validator->getErrors();

From cb8a0525a5d61d772e49be21d3617d9e2d1ee85c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 15 Sep 2022 08:00:55 +0200
Subject: [PATCH 217/269] v2.4.2

---
 composer-bash-completion | 2 +-
 composer.spec            | 9 ++++++---
 sources                  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 4aed20f..d103438 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -24,7 +24,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.1")
+    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.2")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 87ecfe6..c96f904 100644
--- a/composer.spec
+++ b/composer.spec
@@ -18,7 +18,7 @@
 %bcond_with          syslib
 %endif
 
-%global gh_commit    777d542e3af65f8e7a66a4d98ce7a697da339414
+%global gh_commit    7d887621e69a0311eb50aed4a16f7044b2b385b9
 %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.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.4.1
+%global upstream_version 2.4.2
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -147,7 +147,7 @@ Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v2.9.0
 Provides:       bundled(php-seld-jsonlint) = 1.9.0
-Provides:       bundled(php-seld-phar-utils) = 1.2.0
+Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.1
 Provides:       bundled(php-symfony-console) = v5.4.12
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
@@ -394,6 +394,9 @@ exit $ret
 
 
 %changelog
+* Thu Sep 15 2022 Remi Collet <remi@remirepo.net> - 2.4.2-1
+- update to 2.4.2
+
 * Mon Aug 29 2022 Remi Collet <remi@remirepo.net> - 2.4.1-1
 - update to 2.4.1
 
diff --git a/sources b/sources
index 2502211..064adc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.4.1-777d542.tgz) = 64b3f4d729af225004351c9a5cbb4c763f127b25af7e5b7961bd2db1051b1656bef3f42c3f9d359d030d674a8de908b78b98230a3ada9820c8c6794bfdc90b85
+SHA512 (composer-2.4.2-7d88762.tgz) = 6fd59eb380a00621ca90052a46205bf20f0ad8b916721fb3806c6f2e84c073e77a7f7c29bc8c51ae81d042da9bd55db03fbd057665c7e93f0d66fa0e5e02fbf2

From a8d6f101ec4f4b811094600a8897d05aa962e418 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 17 Oct 2022 09:58:30 +0200
Subject: [PATCH 218/269] v2.4.3

---
 composer.spec | 163 ++++----------------------------------------------
 sources       |   2 +-
 2 files changed, 11 insertions(+), 154 deletions(-)

diff --git a/composer.spec b/composer.spec
index c96f904..3414455 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,15 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%if 0
-%bcond_without       tests
-%bcond_without       syslib
-%else
-%bcond_with          tests
-%bcond_with          syslib
-%endif
-
-%global gh_commit    7d887621e69a0311eb50aed4a16f7044b2b385b9
+%global gh_commit    b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -26,14 +18,10 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.4.2
+%global upstream_version 2.4.3
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
-%global symfony_prefix php-symfony5
-%global symfony_path   %{_datadir}/php/Symfony5
-%global symfony_min    5.4.1
-
 %global _phpunit       %{_bindir}/phpunit9
 %global bashcompdir    %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
 %global bashcomproot   %(dirname %{bashcompdir} 2>/dev/null)
@@ -66,30 +54,6 @@ BuildRequires:  php(language) >= 7.2.5
 BuildRequires:  php-cli
 BuildRequires:  php-json
 BuildRequires:  pkgconfig(bash-completion)
-%if %{with tests}
-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)   >= 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.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)             >= 2      with  php-composer(composer/pcre)             <  4)
-BuildRequires:  %{symfony_prefix}-console    >= %{symfony_min}
-BuildRequires:  %{symfony_prefix}-finder     >= %{symfony_min}
-BuildRequires:  %{symfony_prefix}-filesystem >= %{symfony_min}
-BuildRequires:  %{symfony_prefix}-process    >= %{symfony_min}
-BuildRequires:  php-zip
-# From composer.json, "require-dev": {
-#        "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0",
-#        "phpspec/prophecy": "^1.10"
-BuildRequires:  %{_phpunit}
-# For autoloader
-BuildRequires:  php-fedora-autoloader-devel
-%endif
 
 # From composer.json, "require": {
 #        "php": "^7.2.5 || ^8.0",
@@ -112,30 +76,11 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "symfony/polyfill-php80": "^1.24"
 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)
-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.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.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)             >= 2      with  php-composer(composer/pcre)             <  4)
-Requires:       %{symfony_prefix}-console    >= %{symfony_min}
-Requires:       %{symfony_prefix}-finder     >= %{symfony_min}
-Requires:       %{symfony_prefix}-process    >= %{symfony_min}
-Requires:       %{symfony_prefix}-filesystem >= %{symfony_min}
-# For our autoloader
-Requires:       php-composer(fedora/autoloader)
-%else
 # System certificates
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.3.3
+Provides:       bundled(php-composer-ca-bundle) = 1.3.4
 Provides:       bundled(php-composer-class-map-generator) = 1.0.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.0.0
@@ -149,9 +94,9 @@ Provides:       bundled(php-react-promise) = v2.9.0
 Provides:       bundled(php-seld-jsonlint) = 1.9.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.1
-Provides:       bundled(php-symfony-console) = v5.4.12
+Provides:       bundled(php-symfony-console) = v5.4.14
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:       bundled(php-symfony-filesystem) = v5.4.12
+Provides:       bundled(php-symfony-filesystem) = v5.4.13
 Provides:       bundled(php-symfony-finder) = v5.4.11
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0
@@ -161,8 +106,8 @@ Provides:       bundled(php-symfony-polyfill-php73) = v1.26.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.26.0
 Provides:       bundled(php-symfony-process) = v5.4.11
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.12
-%endif
+Provides:       bundled(php-symfony-string) = v5.4.14
+
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives",
@@ -221,47 +166,6 @@ fi
 rm src/bootstrap.php
 rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem
 
-%if %{with syslib}
-rm -rf src/Composer/vendor
-
-phpab --template fedora --output src/Composer/autoload.php src/Composer
-cat << 'EOF' | tee -a src/Composer/autoload.php
-
-\Fedora\Autoloader\Dependencies::required([
-    [  	/* 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',
-    '%{symfony_path}/Component/Filesystem/autoload.php',
-    '%{_datadir}/php/Seld/JsonLint/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/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',
-    ],
-    '%{_datadir}/php/JsonSchema5/autoload.php',
-    '%{_datadir}/php/React/Promise/autoload.php',
-]);
-EOF
-
-cat << 'EOF' | tee tests/bootstrap.php
-<?php
-require 'Composer/autoload.php';
-\Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/');
-EOF
-
-%else
 : symlink autoloader for library
 ln -s vendor/autoload.php src/Composer/autoload.php
 
@@ -287,20 +191,10 @@ php -r '
 		printf("# License %s\n%s\n", $lic, implode("\n", $lib));
 	}
 '
-%endif
 
 : fix reported version
-%if 0%{?gh_date}
-DATE=%{gh_date}
-DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6:2}
-sed -e '/VERSION/s/@package_version@/%{gh_commit}/' \
-    -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@/%{gh_branch}/' \
-    -e "/RELEASE_DATE/s/@release_date@/$DATE/" \
-    -i src/Composer/Composer.php
-%else
 sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \
     -i src/Composer/Composer.php
-%endif
 
 : check Plugin API version
 php -r '
@@ -341,46 +235,6 @@ ln -sf %{_datadir}/%{name}/LICENSE LICENSE
 install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
-%check
-%if %{with tests} && %{with syslib}
-: Online tests
-rm tests/Composer/Test/Util/RemoteFilesystemTest.php
-
-: Ensure not used
-rm -rf res
-
-: Run test suite
-export BUILDROOT=%{buildroot}
-
-# testSearchWithSpecialChars is online
-# testCreateMap fails on 8.1
-# testOutputIgnoresFormatting use InstalledVersions
-FILTER="--filter '^((?!(testIntegration|testSearchWithSpecialChars|testCreateMap|testOutputIgnoresFormatting)).)*$'"
-
-# Adapt for phunit9
-find tests \
-  -name \*.php \
-  -exec sed -e '/function setUpBeforeClass(/s/$/:void/' \
-            -e '/function tearDownAfterClass(/s/$/:void/' \
-            -e '/function setUp(/s/$/:void/' \
-            -e '/function tearDown(/s/$/:void/' \
-            -i {} \;
-
-# testIntegration may hang on local build
-ret=0
-for cmd in php php74 php80 php81; do
-  if which $cmd; then
-    $cmd -d memory_limit=1G %{_phpunit} \
-      $FILTER \
-      --include-path %{buildroot}%{_datadir}/php  || ret=1
-  fi
-done
-exit $ret
-%else
-: Test suite disabled
-%endif
-
-
 %files
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
@@ -394,6 +248,9 @@ exit $ret
 
 
 %changelog
+* Sat Oct 15 2022 Remi Collet <remi@remirepo.net> - 2.4.3-1
+- update to 2.4.3
+
 * Thu Sep 15 2022 Remi Collet <remi@remirepo.net> - 2.4.2-1
 - update to 2.4.2
 
diff --git a/sources b/sources
index 064adc0..ca9254f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.4.2-7d88762.tgz) = 6fd59eb380a00621ca90052a46205bf20f0ad8b916721fb3806c6f2e84c073e77a7f7c29bc8c51ae81d042da9bd55db03fbd057665c7e93f0d66fa0e5e02fbf2
+SHA512 (composer-2.4.3-b34c0e9.tgz) = ce99508c2a534f3ef7c64c65308860b0c368ea8dcba7ad1f9e973783920280dda8a72923298e08e5f4b099d91c7e950d38acf2e3ef6989e659daf6dbd25fc211

From c35955528a4a498eeff121bab5d452d0b700aca8 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 28 Oct 2022 07:45:42 +0200
Subject: [PATCH 219/269] v2.4.4

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index d103438..dba4a5c 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -24,7 +24,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "-sbash" "-c$cword" "-S2.4.2")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.4.4")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 3414455..e836076 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    b34c0e9a93f2cd688c62ce4dfcc69e13b6ce7aa4
+%global gh_commit    e8d9087229bcdbc5867594d3098091412f1130cf
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.4.3
+%global upstream_version 2.4.4
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -248,6 +248,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Fri Oct 28 2022 Remi Collet <remi@remirepo.net> - 2.4.4-1
+- update to 2.4.4
+
 * Sat Oct 15 2022 Remi Collet <remi@remirepo.net> - 2.4.3-1
 - update to 2.4.3
 
diff --git a/sources b/sources
index ca9254f..523ef13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.4.3-b34c0e9.tgz) = ce99508c2a534f3ef7c64c65308860b0c368ea8dcba7ad1f9e973783920280dda8a72923298e08e5f4b099d91c7e950d38acf2e3ef6989e659daf6dbd25fc211
+SHA512 (composer-2.4.4-e8d9087.tgz) = 145ba3501d5f335b9f571f5320f92143258fcd11272882077be4496bcdcd60939d1585336c1fbab3d156157e0db3d5f34b5cd519d928ae27fa78089d7889fd3a

From 0c41f6ede594dc194a304702011d30a70238af90 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 20 Dec 2022 13:46:32 +0100
Subject: [PATCH 220/269] v2.5..0

---
 composer-bash-completion |  9 +++++----
 composer.spec            | 28 ++++++++++++++++------------
 sources                  |  2 +-
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index dba4a5c..64aa6bb 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -11,20 +11,21 @@ _sf_composer() {
     local sf_cmd="${COMP_WORDS[0]}"
 
     # for an alias, get the real script behind it
-    if [[ $(type -t $sf_cmd) == "alias" ]]; then
+    sf_cmd_type=$(type -t $sf_cmd)
+    if [[ $sf_cmd_type == "alias" ]]; then
         sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/")
-    else
+    elif [[ $sf_cmd_type == "file" ]]; then
         sf_cmd=$(type -p $sf_cmd)
     fi
 
-    if [ ! -x "$sf_cmd" ]; then
+    if [[ $sf_cmd_type != "function" && ! -x $sf_cmd ]]; then
         return 1
     fi
 
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.4.4")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.0")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index e836076..9188380 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    e8d9087229bcdbc5867594d3098091412f1130cf
+%global gh_commit    09ef0e3acbb377f28927fa6a527c251da713ebac
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.4.4
+%global upstream_version 2.5.0
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -32,7 +32,7 @@ Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
 Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
-# composer and all dependencies are MIT
+# SPDX: composer and all dependencies are MIT
 License:        MIT
 URL:            https://getcomposer.org/
 Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
@@ -83,7 +83,7 @@ Requires:       ca-certificates
 Provides:       bundled(php-composer-ca-bundle) = 1.3.4
 Provides:       bundled(php-composer-class-map-generator) = 1.0.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
-Provides:       bundled(php-composer-pcre) = 2.0.0
+Provides:       bundled(php-composer-pcre) = 2.1.0
 Provides:       bundled(php-composer-semver) = 3.3.2
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.7
 Provides:       bundled(php-composer-xdebug-handler) = 3.0.3
@@ -94,19 +94,20 @@ Provides:       bundled(php-react-promise) = v2.9.0
 Provides:       bundled(php-seld-jsonlint) = 1.9.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.1
-Provides:       bundled(php-symfony-console) = v5.4.14
+Provides:       bundled(php-symfony-console) = v5.4.16
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
 Provides:       bundled(php-symfony-filesystem) = v5.4.13
 Provides:       bundled(php-symfony-finder) = v5.4.11
-Provides:       bundled(php-symfony-polyfill-ctype) = v1.26.0
-Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.26.0
-Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.26.0
-Provides:       bundled(php-symfony-polyfill-mbstring) = v1.26.0
-Provides:       bundled(php-symfony-polyfill-php73) = v1.26.0
-Provides:       bundled(php-symfony-polyfill-php80) = v1.26.0
+Provides:       bundled(php-symfony-polyfill-ctype) = v1.27.0
+Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0
+Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0
+Provides:       bundled(php-symfony-polyfill-mbstring) = v1.27.0
+Provides:       bundled(php-symfony-polyfill-php73) = v1.27.0
+Provides:       bundled(php-symfony-polyfill-php80) = v1.27.0
+Provides:       bundled(php-symfony-polyfill-php81) = v1.27.0
 Provides:       bundled(php-symfony-process) = v5.4.11
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.14
+Provides:       bundled(php-symfony-string) = v5.4.15
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -248,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Tue Dec 20 2022 Remi Collet <remi@remirepo.net> - 2.5.0-1
+- update to 2.5.0
+
 * Fri Oct 28 2022 Remi Collet <remi@remirepo.net> - 2.4.4-1
 - update to 2.4.4
 
diff --git a/sources b/sources
index 523ef13..0d0cd44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.4.4-e8d9087.tgz) = 145ba3501d5f335b9f571f5320f92143258fcd11272882077be4496bcdcd60939d1585336c1fbab3d156157e0db3d5f34b5cd519d928ae27fa78089d7889fd3a
+SHA512 (composer-2.5.0-09ef0e3.tgz) = 19ab32ab92ce2fbed7a7b26cc22db0ab9fb082243077a65250e24cfd8a6c2b0b74d2ff241ead598dcb245b7aa670901db30750c5cb7ff379f055efc5b639d31e

From 36824f75ab5d7e3d6360cfe253ec94a8eb1cf1c6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 22 Dec 2022 16:25:10 +0100
Subject: [PATCH 221/269] v2.5.1

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 64aa6bb..76b1486 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.0")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.1")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 9188380..708303f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    09ef0e3acbb377f28927fa6a527c251da713ebac
+%global gh_commit    923278ad13e1621946eb76ab2882655d2cc396a4
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.5.0
+%global upstream_version 2.5.1
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Thu Dec 22 2022 Remi Collet <remi@remirepo.net> - 2.5.1-1
+- update to 2.5.1
+
 * Tue Dec 20 2022 Remi Collet <remi@remirepo.net> - 2.5.0-1
 - update to 2.5.0
 
diff --git a/sources b/sources
index 0d0cd44..cb9b58d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.5.0-09ef0e3.tgz) = 19ab32ab92ce2fbed7a7b26cc22db0ab9fb082243077a65250e24cfd8a6c2b0b74d2ff241ead598dcb245b7aa670901db30750c5cb7ff379f055efc5b639d31e
+SHA512 (composer-2.5.1-923278a.tgz) = 3e8a54ea96982ec6e3ae8afdabc60b88abae05e96561536e444ef5b75aac543284cad90458ae78e4d6e0dbc129fde4b345533db1823b27f5404021dd62cb865b

From 0617a5ee92a1768a3d8496372ca15894288ca24c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 00:23:16 +0000
Subject: [PATCH 222/269] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 708303f..aee3d47 100644
--- a/composer.spec
+++ b/composer.spec
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Thu Dec 22 2022 Remi Collet <remi@remirepo.net> - 2.5.1-1
 - update to 2.5.1
 

From 0bf323a92a10b5747beef382d522ffa503ce5033 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 6 Feb 2023 07:27:17 +0100
Subject: [PATCH 223/269] v2.5.2

---
 composer-bash-completion |  2 +-
 composer.spec            | 25 ++++++++++++++-----------
 sources                  |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 76b1486..53e0f7e 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.1")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.2")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index aee3d47..be18cae 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,7 +1,7 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2015-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    923278ad13e1621946eb76ab2882655d2cc396a4
+%global gh_commit    c76c013c555160410af47c03a0e173518e3f5796
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.5.1
+%global upstream_version 2.5.2
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -80,7 +80,7 @@ Requires:       php-cli
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.3.4
+Provides:       bundled(php-composer-ca-bundle) = 1.3.5
 Provides:       bundled(php-composer-class-map-generator) = 1.0.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.1.0
@@ -94,10 +94,10 @@ Provides:       bundled(php-react-promise) = v2.9.0
 Provides:       bundled(php-seld-jsonlint) = 1.9.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.1
-Provides:       bundled(php-symfony-console) = v5.4.16
+Provides:       bundled(php-symfony-console) = v5.4.19
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:       bundled(php-symfony-filesystem) = v5.4.13
-Provides:       bundled(php-symfony-finder) = v5.4.11
+Provides:       bundled(php-symfony-filesystem) = v5.4.19
+Provides:       bundled(php-symfony-finder) = v5.4.19
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0
@@ -105,9 +105,9 @@ Provides:       bundled(php-symfony-polyfill-mbstring) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.27.0
-Provides:       bundled(php-symfony-process) = v5.4.11
+Provides:       bundled(php-symfony-process) = v5.4.19
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.15
+Provides:       bundled(php-symfony-string) = v5.4.19
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Mon Feb  6 2023 Remi Collet <remi@remirepo.net> - 2.5.2-1
+- update to 2.5.2
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index cb9b58d..0b8f49f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.5.1-923278a.tgz) = 3e8a54ea96982ec6e3ae8afdabc60b88abae05e96561536e444ef5b75aac543284cad90458ae78e4d6e0dbc129fde4b345533db1823b27f5404021dd62cb865b
+SHA512 (composer-2.5.2-c76c013.tgz) = a478945f39e427beb01f297f03cefc4edf1f181d9a31a77235e6611f4637a2ad405ec0ab17919c6d946af0684e0a4a4e0f2570fd8ac3cef2a79066eb22f46b40

From de254c8f264e6e2ed0f034965a566e0ea27f9d5a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 10 Feb 2023 14:41:24 +0100
Subject: [PATCH 224/269] v2.5.3

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 53e0f7e..938a1a6 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.2")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.3")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index be18cae..cd4b507 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    c76c013c555160410af47c03a0e173518e3f5796
+%global gh_commit    607a4c04006ce1d2b6fdfd5467bae3d7ad9ce5ab
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.5.2
+%global upstream_version 2.5.3
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Fri Feb 10 2023 Remi Collet <remi@remirepo.net> - 2.5.3-1
+- update to 2.5.3
+
 * Mon Feb  6 2023 Remi Collet <remi@remirepo.net> - 2.5.2-1
 - update to 2.5.2
 
diff --git a/sources b/sources
index 0b8f49f..9459591 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.5.2-c76c013.tgz) = a478945f39e427beb01f297f03cefc4edf1f181d9a31a77235e6611f4637a2ad405ec0ab17919c6d946af0684e0a4a4e0f2570fd8ac3cef2a79066eb22f46b40
+SHA512 (composer-2.5.3-607a4c0.tgz) = 87aff958245b8e267591a6c8784a8bda51e579da83d4e2036f5a896bff4ed10eb6e30984161c73eea266d1c4e1d13ca94120370a6302b53d21acf0d3d46673fe

From ad2f2d8ca14882f231052369bdc4187a6086c12f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 15 Feb 2023 14:34:20 +0100
Subject: [PATCH 225/269] v2.5.4

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 938a1a6..b44f7f2 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.3")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.4")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index cd4b507..e9d0f92 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    607a4c04006ce1d2b6fdfd5467bae3d7ad9ce5ab
+%global gh_commit    6b67eeea4d72051c369ccdbfb2423a56e2ab51a9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.5.3
+%global upstream_version 2.5.4
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Wed Feb 15 2023 Remi Collet <remi@remirepo.net> - 2.5.4-1
+- update to 2.5.4
+
 * Fri Feb 10 2023 Remi Collet <remi@remirepo.net> - 2.5.3-1
 - update to 2.5.3
 
diff --git a/sources b/sources
index 9459591..a4b0a90 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.5.3-607a4c0.tgz) = 87aff958245b8e267591a6c8784a8bda51e579da83d4e2036f5a896bff4ed10eb6e30984161c73eea266d1c4e1d13ca94120370a6302b53d21acf0d3d46673fe
+SHA512 (composer-2.5.4-6b67eee.tgz) = aad853f67a48402832d4bdba768255f6ea8fcff08a1c35d298306b393aed63d5de68e8a763a876964da0658587940ce722c2b1fb85896250b3ecb2e9e1353e5d

From ec74b09b608bbdfed4d7aaf27e2256059da5e919 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 21 Mar 2023 16:01:05 +0100
Subject: [PATCH 226/269] v2.5.5

---
 composer-bash-completion |  2 +-
 composer-rpm.patch       | 63 ++++++++++++----------------------------
 composer.spec            | 17 ++++++-----
 sources                  |  2 +-
 4 files changed, 31 insertions(+), 53 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index b44f7f2..c7e5ec9 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.4")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.5")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 224503a..85536c9 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2022-08-29 07:36:37.000000000 +0200
-+++ ./bin/composer	2022-08-29 07:36:45.053967617 +0200
+--- ./bin/composer.rpm	2023-03-21 15:42:18.000000000 +0100
++++ ./bin/composer	2023-03-21 15:53:50.082632518 +0100
 @@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) {
  }
  
@@ -11,8 +11,8 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2022-08-29 07:36:45.053967617 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2022-08-29 07:38:03.936134475 +0200
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2023-03-21 15:42:18.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2023-03-21 15:53:50.082632518 +0100
 @@ -431,7 +431,7 @@ EOF;
          $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform));
  
@@ -23,9 +23,9 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, [], [
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2022-08-29 07:36:37.000000000 +0200
-+++ ./src/Composer/Compiler.php	2022-08-29 07:36:45.053967617 +0200
-@@ -106,7 +106,7 @@ class Compiler
+--- ./src/Composer/Compiler.php.rpm	2023-03-21 15:42:18.000000000 +0100
++++ ./src/Composer/Compiler.php	2023-03-21 15:53:50.082632518 +0100
+@@ -105,7 +105,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
          $finder->files()
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
---- ./src/Composer/InstalledVersions.php.rpm	2022-08-29 07:36:37.000000000 +0200
-+++ ./src/Composer/InstalledVersions.php	2022-08-29 07:36:45.053967617 +0200
+--- ./src/Composer/InstalledVersions.php.rpm	2023-03-21 15:42:18.000000000 +0100
++++ ./src/Composer/InstalledVersions.php	2023-03-21 15:55:07.748460545 +0100
 @@ -266,7 +266,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
@@ -46,19 +46,19 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
                  self::$installed = include __DIR__ . '/installed.php';
              } else {
                  self::$installed = array();
-@@ -339,7 +339,7 @@ class InstalledVersions
+@@ -341,7 +341,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
              // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
 -            if (substr(__DIR__, -8, 1) !== 'C') {
 +            if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
-                 self::$installed = require __DIR__ . '/installed.php';
-             } else {
-                 self::$installed = array();
+                 /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                 $required = require __DIR__ . '/installed.php';
+                 self::$installed = $required;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2022-08-29 07:36:37.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2022-08-29 07:36:45.053967617 +0200
-@@ -39,7 +39,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2023-03-21 15:42:18.000000000 +0100
++++ ./src/Composer/Json/JsonFile.php	2023-03-21 15:53:50.082632518 +0100
+@@ -40,7 +40,7 @@ class JsonFile
      /** @deprecated Use \JSON_UNESCAPED_UNICODE */
      public const JSON_UNESCAPED_UNICODE = 256;
  
@@ -67,7 +67,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
      /** @var string */
      private $path;
-@@ -216,7 +216,7 @@ class JsonFile
+@@ -223,7 +223,7 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
              $isComposerSchemaFile = true;
@@ -76,21 +76,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
          }
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
-diff -up ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm ./src/Composer/PHPStan/ConfigReturnTypeExtension.php
---- ./src/Composer/PHPStan/ConfigReturnTypeExtension.php.rpm	2022-08-29 07:36:37.000000000 +0200
-+++ ./src/Composer/PHPStan/ConfigReturnTypeExtension.php	2022-08-29 07:36:45.054967614 +0200
-@@ -39,7 +39,7 @@ final class ConfigReturnTypeExtension im
- 
-     public function __construct()
-     {
--        $schema = JsonFile::parseJson((string) file_get_contents(__DIR__.'/../../../res/composer-schema.json'));
-+        $schema = JsonFile::parseJson((string) file_get_contents('/usr/share/composer/res/composer-schema.json'));
-         /**
-          * @var string $prop
-          */
 diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
---- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2022-07-20 09:14:26.000000000 +0200
-+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2022-08-29 07:36:45.054967614 +0200
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2023-01-11 09:27:00.000000000 +0100
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2023-03-21 15:53:50.083632516 +0100
 @@ -125,7 +125,7 @@ class CaBundle
       */
      public static function getBundledCaBundlePath()
@@ -100,16 +88,3 @@ diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Com
  
          // cURL does not understand 'phar://' paths
          // see https://github.com/composer/ca-bundle/issues/10
-diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2022-08-29 07:36:45.054967614 +0200
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2022-08-29 07:39:34.814922582 +0200
-@@ -96,7 +96,8 @@ class ComposerSchemaTest extends TestCas
-     private function check(string $json)
-     {
-         $validator = new Validator();
--        $validator->check(json_decode($json), (object) ['$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json']);
-+        $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
-+        $validator->check(json_decode($json), (object) ['$ref' => 'file://' . $f]);
- 
-         if (!$validator->isValid()) {
-             $errors = $validator->getErrors();
diff --git a/composer.spec b/composer.spec
index e9d0f92..34ef5ce 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    6b67eeea4d72051c369ccdbfb2423a56e2ab51a9
+%global gh_commit    c7cffaad16a60636a776017eac5bd8cd0095c32f
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.5.4
+%global upstream_version 2.5.5
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -94,10 +94,10 @@ Provides:       bundled(php-react-promise) = v2.9.0
 Provides:       bundled(php-seld-jsonlint) = 1.9.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.1
-Provides:       bundled(php-symfony-console) = v5.4.19
+Provides:       bundled(php-symfony-console) = v5.4.21
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:       bundled(php-symfony-filesystem) = v5.4.19
-Provides:       bundled(php-symfony-finder) = v5.4.19
+Provides:       bundled(php-symfony-filesystem) = v5.4.21
+Provides:       bundled(php-symfony-finder) = v5.4.21
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0
@@ -105,9 +105,9 @@ Provides:       bundled(php-symfony-polyfill-mbstring) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.27.0
-Provides:       bundled(php-symfony-process) = v5.4.19
+Provides:       bundled(php-symfony-process) = v5.4.21
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.19
+Provides:       bundled(php-symfony-string) = v5.4.21
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Tue Mar 21 2023 Remi Collet <remi@remirepo.net> - 2.5.5-1
+- update to 2.5.5
+
 * Wed Feb 15 2023 Remi Collet <remi@remirepo.net> - 2.5.4-1
 - update to 2.5.4
 
diff --git a/sources b/sources
index a4b0a90..c649148 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.5.4-6b67eee.tgz) = aad853f67a48402832d4bdba768255f6ea8fcff08a1c35d298306b393aed63d5de68e8a763a876964da0658587940ce722c2b1fb85896250b3ecb2e9e1353e5d
+SHA512 (composer-2.5.5-c7cffaa.tgz) = 0b0bfc68bc39b74dc3031cd9d24403fb958adb3e311cf0152c16b80c4cfac28de008d2fcca985213d0e6b7979e7decc0f2ea59e98293d7f33fa224ed364f4476

From 928b46e1be37e4334158e7208264ae5852919c5b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 24 May 2023 11:02:27 +0200
Subject: [PATCH 227/269] v2.5.6

---
 composer-bash-completion |  2 +-
 composer.spec            | 24 +++++++++++++-----------
 sources                  |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index c7e5ec9..c088bc4 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.5")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.6")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 34ef5ce..ea2dadd 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    c7cffaad16a60636a776017eac5bd8cd0095c32f
+%global gh_commit    f7c05db8b0a66d046203faf3c187e319cd211fae
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.5.5
+%global upstream_version 2.5.6
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -80,7 +80,6 @@ Requires:       php-cli
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.3.5
 Provides:       bundled(php-composer-class-map-generator) = 1.0.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.1.0
@@ -90,13 +89,13 @@ Provides:       bundled(php-composer-xdebug-handler) = 3.0.3
 Provides:       bundled(php-justinrainbow-json-schema) = 5.2.12
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
-Provides:       bundled(php-react-promise) = v2.9.0
-Provides:       bundled(php-seld-jsonlint) = 1.9.0
+Provides:       bundled(php-react-promise) = v2.10.0
+Provides:       bundled(php-seld-jsonlint) = 1.10.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.1
-Provides:       bundled(php-symfony-console) = v5.4.21
+Provides:       bundled(php-symfony-console) = v5.4.23
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:       bundled(php-symfony-filesystem) = v5.4.21
+Provides:       bundled(php-symfony-filesystem) = v5.4.23
 Provides:       bundled(php-symfony-finder) = v5.4.21
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0
@@ -105,9 +104,9 @@ Provides:       bundled(php-symfony-polyfill-mbstring) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.27.0
-Provides:       bundled(php-symfony-process) = v5.4.21
+Provides:       bundled(php-symfony-process) = v5.4.23
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.21
+Provides:       bundled(php-symfony-string) = v5.4.22
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -155,8 +154,8 @@ Documentation: https://getcomposer.org/doc/
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-%patch0 -p1 -b .rpm
-%patch1 -p1 -b .noxdg
+%patch -P0 -p1 -b .rpm
+%patch -P1 -p1 -b .noxdg
 find . \( -name \*.rpm -o -name \*noxdg \) -delete -print
 
 if grep -r '\.\./res'; then
@@ -249,6 +248,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Wed May 24 2023 Remi Collet <remi@remirepo.net> - 2.5.6-1
+- update to 2.5.6
+
 * Tue Mar 21 2023 Remi Collet <remi@remirepo.net> - 2.5.5-1
 - update to 2.5.5
 
diff --git a/sources b/sources
index c649148..c8ac9dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.5.5-c7cffaa.tgz) = 0b0bfc68bc39b74dc3031cd9d24403fb958adb3e311cf0152c16b80c4cfac28de008d2fcca985213d0e6b7979e7decc0f2ea59e98293d7f33fa224ed364f4476
+SHA512 (composer-2.5.6-f7c05db.tgz) = 301a537674886186073057dbf75ff6900f0c152e249002ea72f2a94b4f85512e523f85c8de6b373abeb71a0d1f848c8371799ca42223e4924ee6f958ccc5cfd1

From 553ae0c0f39a9822a8a0c8f947cb8038eb9e6906 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 24 May 2023 16:08:49 +0200
Subject: [PATCH 228/269] v2.5.7

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index c088bc4..43ed18f 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.6")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.7")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index ea2dadd..5f44e07 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    f7c05db8b0a66d046203faf3c187e319cd211fae
+%global gh_commit    d477018d3f2ebd76dede3d3988a0b1a7add4d81e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.5.6
+%global upstream_version 2.5.7
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -248,6 +248,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Wed May 24 2023 Remi Collet <remi@remirepo.net> - 2.5.7-1
+- update to 2.5.7
+
 * Wed May 24 2023 Remi Collet <remi@remirepo.net> - 2.5.6-1
 - update to 2.5.6
 
diff --git a/sources b/sources
index c8ac9dd..6928d0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.5.6-f7c05db.tgz) = 301a537674886186073057dbf75ff6900f0c152e249002ea72f2a94b4f85512e523f85c8de6b373abeb71a0d1f848c8371799ca42223e4924ee6f958ccc5cfd1
+SHA512 (composer-2.5.7-d477018.tgz) = 37b3078f0ca30b395a69114015c7745ad4e3d7cab5098100cbc84a6cbd1737a1defa2380bfcc4adaea8c6934958c0425e154f12597f0b308572fe06f0b362cd6

From e66ada18fdfa7e076b207acd9b1b27c1a77ea101 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 12 Jun 2023 07:23:10 +0200
Subject: [PATCH 229/269] v2.5.8

---
 composer-bash-completion |  2 +-
 composer.spec            | 12 ++++++++----
 sources                  |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 43ed18f..b059ebf 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.7")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.8")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 5f44e07..5310972 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    d477018d3f2ebd76dede3d3988a0b1a7add4d81e
+%global gh_commit    4c516146167d1392c8b9b269bb7c24115d262164
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.3.0
 %global run_version  2.2.2
 
-%global upstream_version 2.5.7
+%global upstream_version 2.5.8
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -80,6 +80,7 @@ Requires:       php-cli
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
+Provides:       bundled(php-composer-ca-bundle) = 1.3.6
 Provides:       bundled(php-composer-class-map-generator) = 1.0.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.1.0
@@ -93,7 +94,7 @@ Provides:       bundled(php-react-promise) = v2.10.0
 Provides:       bundled(php-seld-jsonlint) = 1.10.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.1
-Provides:       bundled(php-symfony-console) = v5.4.23
+Provides:       bundled(php-symfony-console) = v5.4.24
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
 Provides:       bundled(php-symfony-filesystem) = v5.4.23
 Provides:       bundled(php-symfony-finder) = v5.4.21
@@ -104,7 +105,7 @@ Provides:       bundled(php-symfony-polyfill-mbstring) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.27.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.27.0
-Provides:       bundled(php-symfony-process) = v5.4.23
+Provides:       bundled(php-symfony-process) = v5.4.24
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
 Provides:       bundled(php-symfony-string) = v5.4.22
 
@@ -248,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Sat Jun 10 2023 Remi Collet <remi@remirepo.net> - 2.5.8-1
+- update to 2.5.8
+
 * Wed May 24 2023 Remi Collet <remi@remirepo.net> - 2.5.7-1
 - update to 2.5.7
 
diff --git a/sources b/sources
index 6928d0c..b6bf9f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.5.7-d477018.tgz) = 37b3078f0ca30b395a69114015c7745ad4e3d7cab5098100cbc84a6cbd1737a1defa2380bfcc4adaea8c6934958c0425e154f12597f0b308572fe06f0b362cd6
+SHA512 (composer-2.5.8-4c51614.tgz) = 9d93281902e6d859fa61ed72d66d9d6a4aca15fc5e1b7d6a4a0a1fac635268e6834ee6d164a7934af75dc9034b4df1b90bf62b54c12055bd140cd9dc9dee16d3

From ab06d8691a3303ac3d5bf3c32905e98b312ece34 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 16:14:47 +0000
Subject: [PATCH 230/269] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 5310972..1e68084 100644
--- a/composer.spec
+++ b/composer.spec
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Sat Jun 10 2023 Remi Collet <remi@remirepo.net> - 2.5.8-1
 - update to 2.5.8
 

From bf124da26947171a543ceacc7d4d3bf7be624efb Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 1 Sep 2023 11:14:45 +0200
Subject: [PATCH 231/269] v2.6.0

---
 composer-bash-completion |  2 +-
 composer-rpm.patch       | 32 +++++++++++++++---------------
 composer.spec            | 43 +++++++++++++++++++++-------------------
 sources                  |  2 +-
 4 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index b059ebf..a3fbb2a 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.5.8")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.0")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 85536c9..162dcdd 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2023-03-21 15:42:18.000000000 +0100
-+++ ./bin/composer	2023-03-21 15:53:50.082632518 +0100
+--- ./bin/composer.rpm	2023-09-01 11:05:16.000000000 +0200
++++ ./bin/composer	2023-09-01 11:05:28.156309389 +0200
 @@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) {
  }
  
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2023-03-21 15:42:18.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2023-03-21 15:53:50.082632518 +0100
-@@ -431,7 +431,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2023-09-01 11:05:28.156309389 +0200
+@@ -448,7 +448,7 @@ EOF;
          $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform));
  
          $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, [], [
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2023-03-21 15:42:18.000000000 +0100
-+++ ./src/Composer/Compiler.php	2023-03-21 15:53:50.082632518 +0100
+--- ./src/Composer/Compiler.php.rpm	2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/Compiler.php	2023-09-01 11:05:28.156309389 +0200
 @@ -105,7 +105,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
---- ./src/Composer/InstalledVersions.php.rpm	2023-03-21 15:42:18.000000000 +0100
-+++ ./src/Composer/InstalledVersions.php	2023-03-21 15:55:07.748460545 +0100
+--- ./src/Composer/InstalledVersions.php.rpm	2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/InstalledVersions.php	2023-09-01 11:05:28.156309389 +0200
 @@ -266,7 +266,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
@@ -56,8 +56,8 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
                  $required = require __DIR__ . '/installed.php';
                  self::$installed = $required;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2023-03-21 15:42:18.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2023-03-21 15:53:50.082632518 +0100
+--- ./src/Composer/Json/JsonFile.php.rpm	2023-09-01 11:05:16.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2023-09-01 11:06:16.767233012 +0200
 @@ -40,7 +40,7 @@ class JsonFile
      /** @deprecated Use \JSON_UNESCAPED_UNICODE */
      public const JSON_UNESCAPED_UNICODE = 256;
@@ -65,9 +65,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
 -    public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json';
 +    public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
  
-     /** @var string */
-     private $path;
-@@ -223,7 +223,7 @@ class JsonFile
+     public const INDENT_DEFAULT = '    ';
+ 
+@@ -229,7 +229,7 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
              $isComposerSchemaFile = true;
@@ -77,8 +77,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
  
          // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
---- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2023-01-11 09:27:00.000000000 +0100
-+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2023-03-21 15:53:50.083632516 +0100
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2023-08-30 11:31:38.000000000 +0200
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2023-09-01 11:05:28.156309389 +0200
 @@ -125,7 +125,7 @@ class CaBundle
       */
      public static function getBundledCaBundlePath()
diff --git a/composer.spec b/composer.spec
index 1e68084..aa302c1 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,15 +10,15 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    4c516146167d1392c8b9b269bb7c24115d262164
+%global gh_commit    ea4222fad9d38d8969fc85c9801e4af2171f0f5d
 %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.3.0
+%global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.5.8
+%global upstream_version 2.6.0
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -80,34 +80,34 @@ Requires:       php-cli
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.3.6
-Provides:       bundled(php-composer-class-map-generator) = 1.0.0
+Provides:       bundled(php-composer-ca-bundle) = 1.3.7
+Provides:       bundled(php-composer-class-map-generator) = 1.1.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.1.0
-Provides:       bundled(php-composer-semver) = 3.3.2
+Provides:       bundled(php-composer-semver) = 3.4.0
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.7
 Provides:       bundled(php-composer-xdebug-handler) = 3.0.3
 Provides:       bundled(php-justinrainbow-json-schema) = 5.2.12
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
-Provides:       bundled(php-react-promise) = v2.10.0
+Provides:       bundled(php-react-promise) = v3.0.0
 Provides:       bundled(php-seld-jsonlint) = 1.10.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.1
-Provides:       bundled(php-symfony-console) = v5.4.24
+Provides:       bundled(php-symfony-console) = v5.4.28
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:       bundled(php-symfony-filesystem) = v5.4.23
-Provides:       bundled(php-symfony-finder) = v5.4.21
-Provides:       bundled(php-symfony-polyfill-ctype) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-mbstring) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-php73) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-php80) = v1.27.0
-Provides:       bundled(php-symfony-polyfill-php81) = v1.27.0
-Provides:       bundled(php-symfony-process) = v5.4.24
+Provides:       bundled(php-symfony-filesystem) = v5.4.25
+Provides:       bundled(php-symfony-finder) = v5.4.27
+Provides:       bundled(php-symfony-polyfill-ctype) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-mbstring) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-php73) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-php80) = v1.28.0
+Provides:       bundled(php-symfony-polyfill-php81) = v1.28.0
+Provides:       bundled(php-symfony-process) = v5.4.28
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.22
+Provides:       bundled(php-symfony-string) = v5.4.26
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Fri Sep  1 2023 Remi Collet <remi@remirepo.net> - 2.6.0-1
+- update to 2.6.0
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index b6bf9f6..de98b2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.5.8-4c51614.tgz) = 9d93281902e6d859fa61ed72d66d9d6a4aca15fc5e1b7d6a4a0a1fac635268e6834ee6d164a7934af75dc9034b4df1b90bf62b54c12055bd140cd9dc9dee16d3
+SHA512 (composer-2.6.0-ea4222f.tgz) = a53eff955a548cfd18d3f598c5941190105b893fc34add7ca7e0d36b260d013859303feca6bd9f9ff003d15f8cf6b574a4a5feb80d059f48ce4b084a281d2a98

From d61d8841f8b4810dbdec2f6d10de95839113d98a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 1 Sep 2023 15:27:04 +0200
Subject: [PATCH 232/269] v2.6.1

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index a3fbb2a..79c7474 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.0")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.1")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index aa302c1..ec9314a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    ea4222fad9d38d8969fc85c9801e4af2171f0f5d
+%global gh_commit    ee851d6b6bb4bf2e0fbfb22b22b44727cded6f29
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.6.0
+%global upstream_version 2.6.1
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Fri Sep  1 2023 Remi Collet <remi@remirepo.net> - 2.6.1-1
+- update to 2.6.1
+
 * Fri Sep  1 2023 Remi Collet <remi@remirepo.net> - 2.6.0-1
 - update to 2.6.0
 
diff --git a/sources b/sources
index de98b2d..ef950cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.6.0-ea4222f.tgz) = a53eff955a548cfd18d3f598c5941190105b893fc34add7ca7e0d36b260d013859303feca6bd9f9ff003d15f8cf6b574a4a5feb80d059f48ce4b084a281d2a98
+SHA512 (composer-2.6.1-ee851d6.tgz) = b42385f90ccd6bc7657aac909c63f671dc195eba3394d3b8011f982ebe2854b7244c62c6183494d2e09dea45ec6cc75f71e9414c80b6ffd380bc4ee29c9b5b56

From bbab13e27781fd3a7a086ea1ed89ba2c56a57787 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 4 Sep 2023 06:52:00 +0200
Subject: [PATCH 233/269] v2.6.2

---
 composer-bash-completion | 2 +-
 composer.spec            | 9 ++++++---
 sources                  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 79c7474..c75682d 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.1")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.2")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index ec9314a..bdae7ca 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    ee851d6b6bb4bf2e0fbfb22b22b44727cded6f29
+%global gh_commit    623e5e1de055e65bc6c3c61b8348dc4662d75e2b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.6.1
+%global upstream_version 2.6.2
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -93,7 +93,7 @@ Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v3.0.0
 Provides:       bundled(php-seld-jsonlint) = 1.10.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
-Provides:       bundled(php-seld-signal-handler) = 2.0.1
+Provides:       bundled(php-seld-signal-handler) = 2.0.2
 Provides:       bundled(php-symfony-console) = v5.4.28
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
 Provides:       bundled(php-symfony-filesystem) = v5.4.25
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Mon Sep  4 2023 Remi Collet <remi@remirepo.net> - 2.6.2-1
+- update to 2.6.2
+
 * Fri Sep  1 2023 Remi Collet <remi@remirepo.net> - 2.6.1-1
 - update to 2.6.1
 
diff --git a/sources b/sources
index ef950cf..3ff75aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.6.1-ee851d6.tgz) = b42385f90ccd6bc7657aac909c63f671dc195eba3394d3b8011f982ebe2854b7244c62c6183494d2e09dea45ec6cc75f71e9414c80b6ffd380bc4ee29c9b5b56
+SHA512 (composer-2.6.2-623e5e1.tgz) = 8eebd9f7f3db92824591389b0945378484c75b02de226f9871b0512e0c1e4160b3bbb7bf461d0b402d268c392f79e8317304b3eab27b1e4a9aea905c41643227

From d10a9845d4ce9b56ce9cca0ee9930bc6cfbca3c1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 15 Sep 2023 13:13:06 +0200
Subject: [PATCH 234/269] v2.6.3

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index c75682d..1ea6ff2 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.2")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.3")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index bdae7ca..f3ad22b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    623e5e1de055e65bc6c3c61b8348dc4662d75e2b
+%global gh_commit    ff477832e6d838a736556d4a39a3b80f4412abfd
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.6.2
+%global upstream_version 2.6.3
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Fri Sep 15 2023 Remi Collet <remi@remirepo.net> - 2.6.3-1
+- update to 2.6.3
+
 * Mon Sep  4 2023 Remi Collet <remi@remirepo.net> - 2.6.2-1
 - update to 2.6.2
 
diff --git a/sources b/sources
index 3ff75aa..1c7f767 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.6.2-623e5e1.tgz) = 8eebd9f7f3db92824591389b0945378484c75b02de226f9871b0512e0c1e4160b3bbb7bf461d0b402d268c392f79e8317304b3eab27b1e4a9aea905c41643227
+SHA512 (composer-2.6.3-ff47783.tgz) = 445ad60bf5b9c9b1c5979cedf460da31f8cd9b3f00994fc83e8285b92ae009ccb89deb5b3cd325bd55dd608c0a5135146686ea7f77b0a8c2a61b9f098ad8379e

From 49525f29c8c99319479680718c0d71cd296ebd3d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 29 Sep 2023 14:23:00 +0200
Subject: [PATCH 235/269] v2.6.4

---
 composer-bash-completion | 2 +-
 composer.spec            | 9 ++++++---
 sources                  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 1ea6ff2..5da62d0 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.3")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.4")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index f3ad22b..856d55e 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    ff477832e6d838a736556d4a39a3b80f4412abfd
+%global gh_commit    d75d17c16a863438027d1d96401cddcd6aa5bb60
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.6.3
+%global upstream_version 2.6.4
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -87,7 +87,7 @@ Provides:       bundled(php-composer-pcre) = 2.1.0
 Provides:       bundled(php-composer-semver) = 3.4.0
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.7
 Provides:       bundled(php-composer-xdebug-handler) = 3.0.3
-Provides:       bundled(php-justinrainbow-json-schema) = 5.2.12
+Provides:       bundled(php-justinrainbow-json-schema) = v5.2.13
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v3.0.0
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Fri Sep 29 2023 Remi Collet <remi@remirepo.net> - 2.6.4-1
+- update to 2.6.4
+
 * Fri Sep 15 2023 Remi Collet <remi@remirepo.net> - 2.6.3-1
 - update to 2.6.3
 
diff --git a/sources b/sources
index 1c7f767..f974a72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.6.3-ff47783.tgz) = 445ad60bf5b9c9b1c5979cedf460da31f8cd9b3f00994fc83e8285b92ae009ccb89deb5b3cd325bd55dd608c0a5135146686ea7f77b0a8c2a61b9f098ad8379e
+SHA512 (composer-2.6.4-d75d17c.tgz) = 2a8115400d9eebdf1cfb9db12397e9ac2dc729b9fd107785e33304cf2052eb7ca55f596f45f3f8ff3025204d3276eff9910a3f009c5988f230fd514a2b2759c0

From 3963ff73f9261baf355c9660b84dd1d0aa863fed Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 29 Sep 2023 14:38:49 +0200
Subject: [PATCH 236/269] v1.10.27

---
 composer.spec | 15 +++++++++------
 sources       |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/composer.spec b/composer.spec
index b4df0a7..38affb1 100644
--- a/composer.spec
+++ b/composer.spec
@@ -12,7 +12,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    3e196135eacf9e519a6b00986bc6fe6aff977997
+%global gh_commit    f8f49191eec76f039b466aa1f161406fe43aff50
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
 %global gh_owner     composer
@@ -20,7 +20,7 @@
 %global api_version  1.1.0
 %global run_version  1.0.0
 
-%global upstream_version 1.10.26
+%global upstream_version 1.10.27
 #global upstream_prever  RC
 
 %if 0
@@ -51,7 +51,6 @@ Patch0:         %{name}-rpm.patch
 
 BuildArch:      noarch
 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/semver)           >= 1.0    with  php-composer(composer/semver)           <  2)
@@ -76,15 +75,16 @@ BuildRequires:  %{symfony_prefix}-finder
 BuildRequires:  %{symfony_prefix}-filesystem
 BuildRequires:  %{symfony_prefix}-process
 BuildRequires:  php-zip
+%if %{with tests}
 # From composer.json, "require-dev": {
 #        "symfony/phpunit-bridge": "^4.2",
 #        "phpspec/prophecy": "^1.10"
 BuildRequires:  phpunit
+%endif
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
 BuildRequires:  php-seld-phar-utils >= 1.0.1
 BuildRequires:  php-PsrLog          >= 1.0.0-8
-%endif
 
 # From composer.json, "require": {
 #        "php": "^5.3.2 || ^7.0 || ^8.0",
@@ -173,7 +173,7 @@ Documentation: https://getcomposer.org/doc/
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-%patch0 -p1 -b .rpm
+%patch -P0 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
 
 if grep -r '\.\./res'; then
@@ -252,7 +252,7 @@ ret=0
 for cmd in php php72 php73 php74; do
   if which $cmd; then
     $cmd -d memory_limit=1G %{_bindir}/phpunit \
-      --filter '^((?!(testIntegration)).)*$' \
+      --filter '^((?!(testIntegration|testUpdateDoesntThrowsRuntimeExceptionIfGitCommandFailsAtFirstButIsAbleToRecover)).)*$' \
       --include-path %{buildroot}%{_datadir}/php  || ret=1
   fi
 done
@@ -274,6 +274,9 @@ exit $ret
 
 
 %changelog
+* Fri Sep 29 2023 Remi Collet <remi@remirepo.net> - 1.10.27-1
+- update to 1.10.27
+
 * Thu Apr 14 2022 Remi Collet <remi@remirepo.net> - 1.10.26-1
 - update to 1.10.26
 
diff --git a/sources b/sources
index 3ac7510..94852e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-1.10.26-3e19613.tgz) = abe1cadba212859433e019d83ac7b21d491ae81e6484a67feaf89bd6b87d8a22184425f12b6d5f39ac68569608ba1bb91043cfce7e99e1b8e702a27fa4504fb4
+SHA512 (composer-1.10.27-f8f4919.tgz) = 235a54a94c94d9f055048bfdfb5d7fbec677998db83687a516bf24510dedce2a84eea384d5c6162ca2215f39884a36701e61a62d44d7d33db4e27c3230d77ad3

From c2d8866cfc0a1d7e6824afc53165a9353abaa3a2 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 6 Oct 2023 10:32:40 +0200
Subject: [PATCH 237/269] v2.6.5

---
 composer-bash-completion | 2 +-
 composer.spec            | 9 ++++++---
 sources                  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 5da62d0..0f414c4 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.4")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.5")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 856d55e..b1fee2b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    d75d17c16a863438027d1d96401cddcd6aa5bb60
+%global gh_commit    4b0fe89db9e65b1e64df633a992e70a7a215ab33
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.6.4
+%global upstream_version 2.6.5
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -107,7 +107,7 @@ Provides:       bundled(php-symfony-polyfill-php80) = v1.28.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.28.0
 Provides:       bundled(php-symfony-process) = v5.4.28
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.26
+Provides:       bundled(php-symfony-string) = v5.4.29
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Fri Oct  6 2023 Remi Collet <remi@remirepo.net> - 2.6.5-1
+- update to 2.6.5
+
 * Fri Sep 29 2023 Remi Collet <remi@remirepo.net> - 2.6.4-1
 - update to 2.6.4
 
diff --git a/sources b/sources
index f974a72..37b25bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.6.4-d75d17c.tgz) = 2a8115400d9eebdf1cfb9db12397e9ac2dc729b9fd107785e33304cf2052eb7ca55f596f45f3f8ff3025204d3276eff9910a3f009c5988f230fd514a2b2759c0
+SHA512 (composer-2.6.5-4b0fe89.tgz) = 143a0f10237c23ebf869d3dcdcdbb60ad484846ef668ecb7d5e8dd1b17a34745470b45f82ab5f17165370882c7c3787244052876854e07a6c03b7a36a12a99ba

From 85f376e77bbb6f9fe940f5390e4bd1e22a7c5c2f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 11 Dec 2023 07:01:30 +0100
Subject: [PATCH 238/269] v2.6.6

---
 composer-bash-completion |  2 +-
 composer.spec            | 17 ++++++++++-------
 sources                  |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 0f414c4..d0d01b7 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.5")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.6")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index b1fee2b..88dff81 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    4b0fe89db9e65b1e64df633a992e70a7a215ab33
+%global gh_commit    683557bd2466072777309d039534bb1332d0dda5
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.6.5
+%global upstream_version 2.6.6
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -83,18 +83,18 @@ Requires:       ca-certificates
 Provides:       bundled(php-composer-ca-bundle) = 1.3.7
 Provides:       bundled(php-composer-class-map-generator) = 1.1.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
-Provides:       bundled(php-composer-pcre) = 2.1.0
+Provides:       bundled(php-composer-pcre) = 2.1.1
 Provides:       bundled(php-composer-semver) = 3.4.0
-Provides:       bundled(php-composer-spdx-licenses) = 1.5.7
+Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
 Provides:       bundled(php-composer-xdebug-handler) = 3.0.3
 Provides:       bundled(php-justinrainbow-json-schema) = v5.2.13
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
-Provides:       bundled(php-react-promise) = v3.0.0
+Provides:       bundled(php-react-promise) = v3.1.0
 Provides:       bundled(php-seld-jsonlint) = 1.10.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.28
+Provides:       bundled(php-symfony-console) = v5.4.32
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
 Provides:       bundled(php-symfony-filesystem) = v5.4.25
 Provides:       bundled(php-symfony-finder) = v5.4.27
@@ -107,7 +107,7 @@ Provides:       bundled(php-symfony-polyfill-php80) = v1.28.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.28.0
 Provides:       bundled(php-symfony-process) = v5.4.28
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.29
+Provides:       bundled(php-symfony-string) = v5.4.32
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Sat Dec  9 2023 Remi Collet <remi@remirepo.net> - 2.6.6-1
+- update to 2.6.6
+
 * Fri Oct  6 2023 Remi Collet <remi@remirepo.net> - 2.6.5-1
 - update to 2.6.5
 
diff --git a/sources b/sources
index 37b25bc..7e0757a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.6.5-4b0fe89.tgz) = 143a0f10237c23ebf869d3dcdcdbb60ad484846ef668ecb7d5e8dd1b17a34745470b45f82ab5f17165370882c7c3787244052876854e07a6c03b7a36a12a99ba
+SHA512 (composer-2.6.6-683557b.tgz) = 2794151763356a7b2c11a3f864a4aa892e7f486ffabbf75aaab886237e95594e52e1a4a4769bfb7689e458f83bd0d86c02eea1c437841fda2674020f1b30830e

From 27fb294380b237be2690e104cc8b8fe4eb045c76 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 16:03:28 +0000
Subject: [PATCH 239/269] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 88dff81..577f4ed 100644
--- a/composer.spec
+++ b/composer.spec
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Dec  9 2023 Remi Collet <remi@remirepo.net> - 2.6.6-1
 - update to 2.6.6
 

From b57846573b218ce7dfd715b4d39bdfa689bf8794 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 07:54:04 +0000
Subject: [PATCH 240/269] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 577f4ed..f1f99a9 100644
--- a/composer.spec
+++ b/composer.spec
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From a3accb113902526e67586e06fb9268f350e1e484 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 12 Feb 2024 10:33:30 +0100
Subject: [PATCH 241/269] v2.7.1

---
 composer-bash-completion |  2 +-
 composer.spec            | 37 ++++++++++++++++++++-----------------
 sources                  |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index d0d01b7..d9af6f6 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.6.6")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.1")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index f1f99a9..047f15a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    683557bd2466072777309d039534bb1332d0dda5
+%global gh_commit    aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.6.6
+%global upstream_version 2.7.1
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -80,7 +80,7 @@ Requires:       php-cli
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.3.7
+Provides:       bundled(php-composer-ca-bundle) = 1.4.0
 Provides:       bundled(php-composer-class-map-generator) = 1.1.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.1.1
@@ -91,23 +91,23 @@ Provides:       bundled(php-justinrainbow-json-schema) = v5.2.13
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v3.1.0
-Provides:       bundled(php-seld-jsonlint) = 1.10.0
+Provides:       bundled(php-seld-jsonlint) = 1.10.2
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.32
+Provides:       bundled(php-symfony-console) = v5.4.35
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:       bundled(php-symfony-filesystem) = v5.4.25
-Provides:       bundled(php-symfony-finder) = v5.4.27
-Provides:       bundled(php-symfony-polyfill-ctype) = v1.28.0
-Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.28.0
-Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.28.0
-Provides:       bundled(php-symfony-polyfill-mbstring) = v1.28.0
-Provides:       bundled(php-symfony-polyfill-php73) = v1.28.0
-Provides:       bundled(php-symfony-polyfill-php80) = v1.28.0
-Provides:       bundled(php-symfony-polyfill-php81) = v1.28.0
-Provides:       bundled(php-symfony-process) = v5.4.28
+Provides:       bundled(php-symfony-filesystem) = v5.4.35
+Provides:       bundled(php-symfony-finder) = v5.4.35
+Provides:       bundled(php-symfony-polyfill-ctype) = v1.29.0
+Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0
+Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0
+Provides:       bundled(php-symfony-polyfill-mbstring) = v1.29.0
+Provides:       bundled(php-symfony-polyfill-php73) = v1.29.0
+Provides:       bundled(php-symfony-polyfill-php80) = v1.29.0
+Provides:       bundled(php-symfony-polyfill-php81) = v1.29.0
+Provides:       bundled(php-symfony-process) = v5.4.35
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.32
+Provides:       bundled(php-symfony-string) = v5.4.35
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Sat Feb 10 2024 Remi Collet <remi@remirepo.net> - 2.7.1-1
+- update to 2.7.1
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 7e0757a..14804b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.6.6-683557b.tgz) = 2794151763356a7b2c11a3f864a4aa892e7f486ffabbf75aaab886237e95594e52e1a4a4769bfb7689e458f83bd0d86c02eea1c437841fda2674020f1b30830e
+SHA512 (composer-2.7.1-aaf6ed5.tgz) = 727b1d212b56563d559286847be97d20bb021e44e4c5b7e812a6a41216ba1228ee16c1b1ce51250c7248262e9bfe9b2f276f172cee2fd2ba7a8c8045d0345863

From 289c869f722bf392b618e774de9e99468c45ed74 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 12 Mar 2024 07:20:15 +0100
Subject: [PATCH 242/269] v2.7.2

---
 composer-bash-completion |  2 +-
 composer.spec            | 19 +++++++++++--------
 sources                  |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index d9af6f6..7b1d166 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.1")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.2")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 047f15a..41a20d7 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2023 Remi Collet
+# Copyright (c) 2015-2024 Remi Collet
 # License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc
+%global gh_commit    b826edb791571ab1eaf281eb1bd6e181a1192adc
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.7.1
+%global upstream_version 2.7.2
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -80,10 +80,10 @@ Requires:       php-cli
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.4.0
+Provides:       bundled(php-composer-ca-bundle) = 1.4.1
 Provides:       bundled(php-composer-class-map-generator) = 1.1.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
-Provides:       bundled(php-composer-pcre) = 2.1.1
+Provides:       bundled(php-composer-pcre) = 2.1.2
 Provides:       bundled(php-composer-semver) = 3.4.0
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
 Provides:       bundled(php-composer-xdebug-handler) = 3.0.3
@@ -94,7 +94,7 @@ Provides:       bundled(php-react-promise) = v3.1.0
 Provides:       bundled(php-seld-jsonlint) = 1.10.2
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.35
+Provides:       bundled(php-symfony-console) = v5.4.36
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
 Provides:       bundled(php-symfony-filesystem) = v5.4.35
 Provides:       bundled(php-symfony-finder) = v5.4.35
@@ -105,9 +105,9 @@ Provides:       bundled(php-symfony-polyfill-mbstring) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.29.0
-Provides:       bundled(php-symfony-process) = v5.4.35
+Provides:       bundled(php-symfony-process) = v5.4.36
 Provides:       bundled(php-symfony-service-contracts) = v2.5.2
-Provides:       bundled(php-symfony-string) = v5.4.35
+Provides:       bundled(php-symfony-string) = v5.4.36
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Tue Mar 12 2024 Remi Collet <remi@remirepo.net> - 2.7.2-1
+- update to 2.7.2
+
 * Sat Feb 10 2024 Remi Collet <remi@remirepo.net> - 2.7.1-1
 - update to 2.7.1
 
diff --git a/sources b/sources
index 14804b8..b32c9b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.7.1-aaf6ed5.tgz) = 727b1d212b56563d559286847be97d20bb021e44e4c5b7e812a6a41216ba1228ee16c1b1ce51250c7248262e9bfe9b2f276f172cee2fd2ba7a8c8045d0345863
+SHA512 (composer-2.7.2-b826edb.tgz) = 87b616e1c30e863162d0ce6ad1835b0040b373ebccf2125829cde1babec69511ca51d727f8f376fe5a6802115881c6bcc1b63c9a6325c17279973ba41576c87d

From 704a77856ce1c36ed3294d0854b323caae93dda1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 23 Apr 2024 07:48:18 +0200
Subject: [PATCH 243/269] v2.7.4

---
 composer-bash-completion |  2 +-
 composer-noxdg.patch     |  8 ++++----
 composer.spec            | 21 ++++++++++++---------
 sources                  |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 7b1d166..d57fa7c 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.2")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.4")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer-noxdg.patch b/composer-noxdg.patch
index 73195e7..8971527 100644
--- a/composer-noxdg.patch
+++ b/composer-noxdg.patch
@@ -1,7 +1,7 @@
 diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php
---- ./src/Composer/Factory.php.noxdg	2022-03-16 09:51:30.398977729 +0100
-+++ ./src/Composer/Factory.php	2022-03-16 09:52:14.113841110 +0100
-@@ -665,6 +665,10 @@ class Factory
+--- ./src/Composer/Factory.php.noxdg	2024-04-20 12:34:54.442117723 +0200
++++ ./src/Composer/Factory.php	2024-04-20 12:35:39.497640757 +0200
+@@ -680,6 +680,10 @@ class Factory
  
      private static function useXdg(): bool
      {
@@ -10,5 +10,5 @@ diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php
 +        return false;
 +
          foreach (array_keys($_SERVER) as $key) {
-             if (strpos($key, 'XDG_') === 0) {
+             if (strpos((string) $key, 'XDG_') === 0) {
                  return true;
diff --git a/composer.spec b/composer.spec
index 41a20d7..2c9e4c5 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    b826edb791571ab1eaf281eb1bd6e181a1192adc
+%global gh_commit    a625e50598e12171d3f60b1149eb530690c43474
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.7.2
+%global upstream_version 2.7.4
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -80,13 +80,13 @@ Requires:       php-cli
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.4.1
-Provides:       bundled(php-composer-class-map-generator) = 1.1.0
+Provides:       bundled(php-composer-ca-bundle) = 1.5.0
+Provides:       bundled(php-composer-class-map-generator) = 1.1.1
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
-Provides:       bundled(php-composer-pcre) = 2.1.2
+Provides:       bundled(php-composer-pcre) = 2.1.3
 Provides:       bundled(php-composer-semver) = 3.4.0
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
-Provides:       bundled(php-composer-xdebug-handler) = 3.0.3
+Provides:       bundled(php-composer-xdebug-handler) = 3.0.4
 Provides:       bundled(php-justinrainbow-json-schema) = v5.2.13
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
@@ -95,8 +95,8 @@ Provides:       bundled(php-seld-jsonlint) = 1.10.2
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.2
 Provides:       bundled(php-symfony-console) = v5.4.36
-Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.2
-Provides:       bundled(php-symfony-filesystem) = v5.4.35
+Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.3
+Provides:       bundled(php-symfony-filesystem) = v5.4.38
 Provides:       bundled(php-symfony-finder) = v5.4.35
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0
@@ -106,7 +106,7 @@ Provides:       bundled(php-symfony-polyfill-php73) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.29.0
 Provides:       bundled(php-symfony-process) = v5.4.36
-Provides:       bundled(php-symfony-service-contracts) = v2.5.2
+Provides:       bundled(php-symfony-service-contracts) = v2.5.3
 Provides:       bundled(php-symfony-string) = v5.4.36
 
 # From composer.json, suggest
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Tue Apr 23 2024 Remi Collet <remi@remirepo.net> - 2.7.4-1
+- update to 2.7.4
+
 * Tue Mar 12 2024 Remi Collet <remi@remirepo.net> - 2.7.2-1
 - update to 2.7.2
 
diff --git a/sources b/sources
index b32c9b5..f70aa09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.7.2-b826edb.tgz) = 87b616e1c30e863162d0ce6ad1835b0040b373ebccf2125829cde1babec69511ca51d727f8f376fe5a6802115881c6bcc1b63c9a6325c17279973ba41576c87d
+SHA512 (composer-2.7.4-a625e50.tgz) = e3b5f8ec2fe90bb9ce3009043759a8717d4a74bfad7fd919497f76212e538932c2bba1d4653efb58e610f39be64266dc2cd7671ae9e9192c972bb40c9c6e3533

From 474ee51ec25413b22c5db4ff40eb6307c8d99470 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 13 May 2024 11:20:35 +0200
Subject: [PATCH 244/269] v2.7.6

---
 composer-bash-completion |  2 +-
 composer.spec            | 17 ++++++++++-------
 sources                  |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index d57fa7c..c94bcf5 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.4")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.6")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 2c9e4c5..1eac3a3 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    a625e50598e12171d3f60b1149eb530690c43474
+%global gh_commit    fabd995783b633829fd4280e272284b39b6ae702
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.7.4
+%global upstream_version 2.7.6
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -94,10 +94,10 @@ Provides:       bundled(php-react-promise) = v3.1.0
 Provides:       bundled(php-seld-jsonlint) = 1.10.2
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.36
+Provides:       bundled(php-symfony-console) = v5.4.39
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.3
-Provides:       bundled(php-symfony-filesystem) = v5.4.38
-Provides:       bundled(php-symfony-finder) = v5.4.35
+Provides:       bundled(php-symfony-filesystem) = v5.4.39
+Provides:       bundled(php-symfony-finder) = v5.4.39
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0
@@ -105,9 +105,9 @@ Provides:       bundled(php-symfony-polyfill-mbstring) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.29.0
-Provides:       bundled(php-symfony-process) = v5.4.36
+Provides:       bundled(php-symfony-process) = v5.4.39
 Provides:       bundled(php-symfony-service-contracts) = v2.5.3
-Provides:       bundled(php-symfony-string) = v5.4.36
+Provides:       bundled(php-symfony-string) = v5.4.39
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Sun May  5 2024 Remi Collet <remi@remirepo.net> - 2.7.6-1
+- update to 2.7.6
+
 * Tue Apr 23 2024 Remi Collet <remi@remirepo.net> - 2.7.4-1
 - update to 2.7.4
 
diff --git a/sources b/sources
index f70aa09..dc72436 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.7.4-a625e50.tgz) = e3b5f8ec2fe90bb9ce3009043759a8717d4a74bfad7fd919497f76212e538932c2bba1d4653efb58e610f39be64266dc2cd7671ae9e9192c972bb40c9c6e3533
+SHA512 (composer-2.7.6-fabd995.tgz) = 76d6c85c504febcb0f1f965eef62f4348b1b1342c6a6178606a7bd7d64715da65cc5713f1dc5d6b00a6411d5a6f87d02793e472c215b94b786720d5befc37076

From eb34bf364c70d189b709e6a3d44cd8ad961bad8f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 11 Jun 2024 07:19:34 +0200
Subject: [PATCH 245/269] v2.7.7

---
 composer-bash-completion |  2 +-
 composer.spec            | 23 +++++++++++++----------
 sources                  |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index c94bcf5..a6f955b 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.6")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.7")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 1eac3a3..520d77f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    fabd995783b633829fd4280e272284b39b6ae702
+%global gh_commit    291942978f39435cf904d33739f98d7d4eca7b23
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.7.6
+%global upstream_version 2.7.7
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -81,23 +81,23 @@ Requires:       ca-certificates
 # Bundled libraries
 # License MIT
 Provides:       bundled(php-composer-ca-bundle) = 1.5.0
-Provides:       bundled(php-composer-class-map-generator) = 1.1.1
+Provides:       bundled(php-composer-class-map-generator) = 1.3.3
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.1.3
 Provides:       bundled(php-composer-semver) = 3.4.0
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
-Provides:       bundled(php-composer-xdebug-handler) = 3.0.4
+Provides:       bundled(php-composer-xdebug-handler) = 3.0.5
 Provides:       bundled(php-justinrainbow-json-schema) = v5.2.13
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
-Provides:       bundled(php-react-promise) = v3.1.0
+Provides:       bundled(php-react-promise) = v3.2.0
 Provides:       bundled(php-seld-jsonlint) = 1.10.2
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.39
+Provides:       bundled(php-symfony-console) = v5.4.40
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.3
-Provides:       bundled(php-symfony-filesystem) = v5.4.39
-Provides:       bundled(php-symfony-finder) = v5.4.39
+Provides:       bundled(php-symfony-filesystem) = v5.4.40
+Provides:       bundled(php-symfony-finder) = v5.4.40
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0
@@ -105,9 +105,9 @@ Provides:       bundled(php-symfony-polyfill-mbstring) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php73) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php80) = v1.29.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.29.0
-Provides:       bundled(php-symfony-process) = v5.4.39
+Provides:       bundled(php-symfony-process) = v5.4.40
 Provides:       bundled(php-symfony-service-contracts) = v2.5.3
-Provides:       bundled(php-symfony-string) = v5.4.39
+Provides:       bundled(php-symfony-string) = v5.4.40
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Tue Jun 11 2024 Remi Collet <remi@remirepo.net> - 2.7.7-1
+- update to 2.7.7
+
 * Sun May  5 2024 Remi Collet <remi@remirepo.net> - 2.7.6-1
 - update to 2.7.6
 
diff --git a/sources b/sources
index dc72436..907a3bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.7.6-fabd995.tgz) = 76d6c85c504febcb0f1f965eef62f4348b1b1342c6a6178606a7bd7d64715da65cc5713f1dc5d6b00a6411d5a6f87d02793e472c215b94b786720d5befc37076
+SHA512 (composer-2.7.7-2919429.tgz) = b97271282087727de2206153275cb3a23b07dd8361ca11adebbf67f9fa000fba8acf7ace4a2847d9e88352f10cc2afb7fa7c23d9a2265a469e0b874b8a1d2bbc

From a7efa75c3991899a519b504ec99800a739103631 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 19:51:47 +0000
Subject: [PATCH 246/269] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 520d77f..d92c820 100644
--- a/composer.spec
+++ b/composer.spec
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue Jun 11 2024 Remi Collet <remi@remirepo.net> - 2.7.7-1
 - update to 2.7.7
 

From 885c8fe38431de72b46f3ace211c8e044bf7ab19 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 26 Aug 2024 12:20:21 +0200
Subject: [PATCH 247/269] v2.7.8

---
 composer-bash-completion |  2 +-
 composer.spec            | 43 +++++++++++++++++++++-------------------
 sources                  |  2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index a6f955b..2cb48d7 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.7")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.8")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index d92c820..5a7efb6 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    291942978f39435cf904d33739f98d7d4eca7b23
+%global gh_commit    a2edd4e4414c17008ab585e0c62574fdb644ebfc
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.7.7
+%global upstream_version 2.7.8
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -80,34 +80,34 @@ Requires:       php-cli
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.5.0
-Provides:       bundled(php-composer-class-map-generator) = 1.3.3
+Provides:       bundled(php-composer-ca-bundle) = 1.5.1
+Provides:       bundled(php-composer-class-map-generator) = 1.3.4
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
-Provides:       bundled(php-composer-pcre) = 2.1.3
-Provides:       bundled(php-composer-semver) = 3.4.0
+Provides:       bundled(php-composer-pcre) = 2.3.0
+Provides:       bundled(php-composer-semver) = 3.4.2
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
 Provides:       bundled(php-composer-xdebug-handler) = 3.0.5
-Provides:       bundled(php-justinrainbow-json-schema) = v5.2.13
+Provides:       bundled(php-justinrainbow-json-schema) = 5.3.0
 Provides:       bundled(php-psr-container) = 1.1.1
 Provides:       bundled(php-psr-log) = 1.1.4
 Provides:       bundled(php-react-promise) = v3.2.0
-Provides:       bundled(php-seld-jsonlint) = 1.10.2
+Provides:       bundled(php-seld-jsonlint) = 1.11.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.40
+Provides:       bundled(php-symfony-console) = v5.4.42
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.3
-Provides:       bundled(php-symfony-filesystem) = v5.4.40
-Provides:       bundled(php-symfony-finder) = v5.4.40
-Provides:       bundled(php-symfony-polyfill-ctype) = v1.29.0
-Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0
-Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0
-Provides:       bundled(php-symfony-polyfill-mbstring) = v1.29.0
-Provides:       bundled(php-symfony-polyfill-php73) = v1.29.0
-Provides:       bundled(php-symfony-polyfill-php80) = v1.29.0
-Provides:       bundled(php-symfony-polyfill-php81) = v1.29.0
+Provides:       bundled(php-symfony-filesystem) = v5.4.41
+Provides:       bundled(php-symfony-finder) = v5.4.42
+Provides:       bundled(php-symfony-polyfill-ctype) = v1.30.0
+Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.30.0
+Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.30.0
+Provides:       bundled(php-symfony-polyfill-mbstring) = v1.30.0
+Provides:       bundled(php-symfony-polyfill-php73) = v1.30.0
+Provides:       bundled(php-symfony-polyfill-php80) = v1.30.0
+Provides:       bundled(php-symfony-polyfill-php81) = v1.30.0
 Provides:       bundled(php-symfony-process) = v5.4.40
 Provides:       bundled(php-symfony-service-contracts) = v2.5.3
-Provides:       bundled(php-symfony-string) = v5.4.40
+Provides:       bundled(php-symfony-string) = v5.4.42
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -249,6 +249,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Fri Aug 23 2024 Remi Collet <remi@remirepo.net> - 2.7.8-1
+- update to 2.7.8
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
diff --git a/sources b/sources
index 907a3bf..f22a25d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.7.7-2919429.tgz) = b97271282087727de2206153275cb3a23b07dd8361ca11adebbf67f9fa000fba8acf7ace4a2847d9e88352f10cc2afb7fa7c23d9a2265a469e0b874b8a1d2bbc
+SHA512 (composer-2.7.8-a2edd4e.tgz) = 4b59ac968406aa3f98eddf5525fe560269e012c406ac32dd80ae9bcf8b983073c999661e785b407ebcfb27c7f59cd6fa4048ab2ba5f3b98813347ce898467380

From f78e81fd0be49919f8ebe3d1018994679cb2bbd0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 4 Sep 2024 15:36:03 +0200
Subject: [PATCH 248/269] v2.7.9

---
 composer-bash-completion |  4 ++--
 composer.spec            | 16 +++++++++-------
 sources                  |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 2cb48d7..1397e05 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -7,7 +7,7 @@
 
 _sf_composer() {
     # Use newline as only separator to allow space in completion values
-    IFS=$'\n'
+    local IFS=$'\n'
     local sf_cmd="${COMP_WORDS[0]}"
 
     # for an alias, get the real script behind it
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.8")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.9")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 5a7efb6..f37cc73 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    a2edd4e4414c17008ab585e0c62574fdb644ebfc
+%global gh_commit    e30ccdd665828ae66eb1be78f056e39e1d5f55ab
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.7.8
+%global upstream_version 2.7.9
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -83,7 +83,7 @@ Requires:       ca-certificates
 Provides:       bundled(php-composer-ca-bundle) = 1.5.1
 Provides:       bundled(php-composer-class-map-generator) = 1.3.4
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
-Provides:       bundled(php-composer-pcre) = 2.3.0
+Provides:       bundled(php-composer-pcre) = 2.3.1
 Provides:       bundled(php-composer-semver) = 3.4.2
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
 Provides:       bundled(php-composer-xdebug-handler) = 3.0.5
@@ -94,10 +94,10 @@ Provides:       bundled(php-react-promise) = v3.2.0
 Provides:       bundled(php-seld-jsonlint) = 1.11.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.42
+Provides:       bundled(php-symfony-console) = v5.4.43
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.3
 Provides:       bundled(php-symfony-filesystem) = v5.4.41
-Provides:       bundled(php-symfony-finder) = v5.4.42
+Provides:       bundled(php-symfony-finder) = v5.4.43
 Provides:       bundled(php-symfony-polyfill-ctype) = v1.30.0
 Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.30.0
 Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.30.0
@@ -107,7 +107,7 @@ Provides:       bundled(php-symfony-polyfill-php80) = v1.30.0
 Provides:       bundled(php-symfony-polyfill-php81) = v1.30.0
 Provides:       bundled(php-symfony-process) = v5.4.40
 Provides:       bundled(php-symfony-service-contracts) = v2.5.3
-Provides:       bundled(php-symfony-string) = v5.4.42
+Provides:       bundled(php-symfony-string) = v5.4.43
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -237,7 +237,6 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md doc
 %doc composer.json
@@ -249,6 +248,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Wed Sep  4 2024 Remi Collet <remi@remirepo.net> - 2.7.9-1
+- update to 2.7.9
+
 * Fri Aug 23 2024 Remi Collet <remi@remirepo.net> - 2.7.8-1
 - update to 2.7.8
 
diff --git a/sources b/sources
index f22a25d..1779ac2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.7.8-a2edd4e.tgz) = 4b59ac968406aa3f98eddf5525fe560269e012c406ac32dd80ae9bcf8b983073c999661e785b407ebcfb27c7f59cd6fa4048ab2ba5f3b98813347ce898467380
+SHA512 (composer-2.7.9-e30ccdd.tgz) = 9be1fdbb76c3cae21ebc1dbbca8b90ac8a99fb749100439994aa8affb07d2f07a39b37c75791b3e455828f940f188d83bb12ee7282cdad6e83e0ff6d4805f8a5

From 9487f51293a9920cd2dc8f79d2f597732c07fe50 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 3 Oct 2024 07:45:43 +0200
Subject: [PATCH 249/269] v2.8.0

---
 composer-bash-completion |  2 +-
 composer-rpm.patch       | 46 ++++++++++++++++++++++-----------------
 composer.spec            | 47 +++++++++++++++++++++++++---------------
 sources                  |  2 +-
 4 files changed, 57 insertions(+), 40 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 1397e05..0e546e7 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.7.9")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.0")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 162dcdd..52ed07b 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,7 +1,7 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2023-09-01 11:05:16.000000000 +0200
-+++ ./bin/composer	2023-09-01 11:05:28.156309389 +0200
-@@ -11,7 +11,7 @@ if (PHP_VERSION_ID < 70205) {
+--- ./bin/composer.rpm	2024-10-03 07:10:57.000000000 +0200
++++ ./bin/composer	2024-10-03 07:11:10.751092365 +0200
+@@ -16,7 +16,7 @@ if (PHP_VERSION_ID < 70205) {
  }
  
  setlocale(LC_ALL, 'C');
@@ -11,9 +11,9 @@ diff -up ./bin/composer.rpm ./bin/composer
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
 diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2023-09-01 11:05:16.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2023-09-01 11:05:28.156309389 +0200
-@@ -448,7 +448,7 @@ EOF;
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2024-10-03 07:10:57.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2024-10-03 07:11:10.752092401 +0200
+@@ -458,7 +458,7 @@ EOF;
          $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform));
  
          $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
          if ($this->runScripts) {
              $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, [], [
 diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2023-09-01 11:05:16.000000000 +0200
-+++ ./src/Composer/Compiler.php	2023-09-01 11:05:28.156309389 +0200
+--- ./src/Composer/Compiler.php.rpm	2024-10-03 07:10:57.000000000 +0200
++++ ./src/Composer/Compiler.php	2024-10-03 07:11:10.752092401 +0200
 @@ -105,7 +105,7 @@ class Compiler
          // Add Composer resources
          $finder = new Finder();
@@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
          ;
          foreach ($finder as $file) {
 diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
---- ./src/Composer/InstalledVersions.php.rpm	2023-09-01 11:05:16.000000000 +0200
-+++ ./src/Composer/InstalledVersions.php	2023-09-01 11:05:28.156309389 +0200
+--- ./src/Composer/InstalledVersions.php.rpm	2024-10-03 07:10:57.000000000 +0200
++++ ./src/Composer/InstalledVersions.php	2024-10-03 07:11:10.752092401 +0200
 @@ -266,7 +266,7 @@ class InstalledVersions
          if (null === self::$installed) {
              // only require the installed.php file if this file is loaded from its dumped location,
@@ -56,29 +56,35 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
                  $required = require __DIR__ . '/installed.php';
                  self::$installed = $required;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2023-09-01 11:05:16.000000000 +0200
-+++ ./src/Composer/Json/JsonFile.php	2023-09-01 11:06:16.767233012 +0200
-@@ -40,7 +40,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2024-10-03 07:11:10.752092401 +0200
++++ ./src/Composer/Json/JsonFile.php	2024-10-03 07:14:54.219192080 +0200
+@@ -41,8 +41,8 @@ class JsonFile
      /** @deprecated Use \JSON_UNESCAPED_UNICODE */
      public const JSON_UNESCAPED_UNICODE = 256;
  
 -    public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json';
+-    public const LOCK_SCHEMA_PATH = __DIR__ . '/../../../res/composer-lock-schema.json';
 +    public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
++    public const LOCK_SCHEMA_PATH = '/usr/share/composer/res/composer-lock-schema.json';
  
      public const INDENT_DEFAULT = '    ';
  
-@@ -229,7 +229,7 @@ class JsonFile
+@@ -231,10 +231,10 @@ class JsonFile
          $isComposerSchemaFile = false;
          if (null === $schemaFile) {
-             $isComposerSchemaFile = true;
--            $schemaFile = self::COMPOSER_SCHEMA_PATH;
-+            $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH;
+             if ($schema === self::LOCK_SCHEMA) {
+-                $schemaFile = self::LOCK_SCHEMA_PATH;
++                $schemaFile = (getenv('BUILDROOT')?:'') . self::LOCK_SCHEMA_PATH;
+             } else {
+                 $isComposerSchemaFile = true;
+-                $schemaFile = self::COMPOSER_SCHEMA_PATH;
++                $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH;
+             }
          }
  
-         // Prepend with file:// only when not using a special schema already (e.g. in the phar)
 diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
---- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2023-08-30 11:31:38.000000000 +0200
-+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2023-09-01 11:05:28.156309389 +0200
+--- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2024-09-25 09:49:53.000000000 +0200
++++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2024-10-03 07:11:10.752092401 +0200
 @@ -125,7 +125,7 @@ class CaBundle
       */
      public static function getBundledCaBundlePath()
diff --git a/composer.spec b/composer.spec
index f37cc73..7d5b870 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    e30ccdd665828ae66eb1be78f056e39e1d5f55ab
+%global gh_commit    d5e75c21ceeb6829918a75ed63b56c576b4a6261
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.7.9
+%global upstream_version 2.8.0
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -80,11 +80,11 @@ Requires:       php-cli
 Requires:       ca-certificates
 # Bundled libraries
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.5.1
+Provides:       bundled(php-composer-ca-bundle) = 1.5.2
 Provides:       bundled(php-composer-class-map-generator) = 1.3.4
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.3.1
-Provides:       bundled(php-composer-semver) = 3.4.2
+Provides:       bundled(php-composer-semver) = 3.4.3
 Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
 Provides:       bundled(php-composer-xdebug-handler) = 3.0.5
 Provides:       bundled(php-justinrainbow-json-schema) = 5.3.0
@@ -94,20 +94,20 @@ Provides:       bundled(php-react-promise) = v3.2.0
 Provides:       bundled(php-seld-jsonlint) = 1.11.0
 Provides:       bundled(php-seld-phar-utils) = 1.2.1
 Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.43
+Provides:       bundled(php-symfony-console) = v5.4.44
 Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.3
-Provides:       bundled(php-symfony-filesystem) = v5.4.41
+Provides:       bundled(php-symfony-filesystem) = v5.4.44
 Provides:       bundled(php-symfony-finder) = v5.4.43
-Provides:       bundled(php-symfony-polyfill-ctype) = v1.30.0
-Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.30.0
-Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.30.0
-Provides:       bundled(php-symfony-polyfill-mbstring) = v1.30.0
-Provides:       bundled(php-symfony-polyfill-php73) = v1.30.0
-Provides:       bundled(php-symfony-polyfill-php80) = v1.30.0
-Provides:       bundled(php-symfony-polyfill-php81) = v1.30.0
-Provides:       bundled(php-symfony-process) = v5.4.40
+Provides:       bundled(php-symfony-polyfill-ctype) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-mbstring) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-php73) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-php80) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-php81) = v1.31.0
+Provides:       bundled(php-symfony-process) = v5.4.44
 Provides:       bundled(php-symfony-service-contracts) = v2.5.3
-Provides:       bundled(php-symfony-string) = v5.4.43
+Provides:       bundled(php-symfony-string) = v5.4.44
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -230,14 +230,22 @@ mkdir -p       %{buildroot}%{_datadir}/%{name}
 cp -pr res     %{buildroot}%{_datadir}/%{name}/res
 cp -p  LICENSE %{buildroot}%{_datadir}/%{name}/LICENSE
 
-ln -sf %{_datadir}/%{name}/LICENSE LICENSE
-
 : Command
 install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
+: Licenses
+ln -sf ../../%{name}/LICENSE LICENSE
+cd src/Composer/vendor
+for lic in */*/LICENSE
+do dir=$(dirname $lic)
+   own=$(dirname $dir)
+   prj=$(basename $dir)
+   ln -sf ../../php/Composer/vendor/$own/$prj/LICENSE ../../../$own-$prj-LICENSE
+done
+
 
 %files
-%license LICENSE
+%license *LICENSE
 %doc *.md doc
 %doc composer.json
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*
@@ -248,6 +256,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 
 %changelog
+* Thu Oct  3 2024 Remi Collet <remi@remirepo.net> - 2.8.0-1
+- update to 2.8.0
+
 * Wed Sep  4 2024 Remi Collet <remi@remirepo.net> - 2.7.9-1
 - update to 2.7.9
 
diff --git a/sources b/sources
index 1779ac2..9f01048 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.7.9-e30ccdd.tgz) = 9be1fdbb76c3cae21ebc1dbbca8b90ac8a99fb749100439994aa8affb07d2f07a39b37c75791b3e455828f940f188d83bb12ee7282cdad6e83e0ff6d4805f8a5
+SHA512 (composer-2.8.0-d5e75c2.tgz) = 59df7a77432bee12d45dfe56ea46cd800aa6c48de5044a7d2edfe1c7b75f1b62cee86151a132f7ed54aa33db30dc68b612436bee51c86f986c8dcc02e1a09eca

From 8e0c415524d256fd08703313087e8c92a46b4251 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 4 Oct 2024 14:43:22 +0200
Subject: [PATCH 250/269] v2.8.1

---
 composer-bash-completion | 2 +-
 composer.spec            | 9 ++++++---
 sources                  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 0e546e7..68f0ea2 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.0")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.1")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 7d5b870..ee53d8b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    d5e75c21ceeb6829918a75ed63b56c576b4a6261
+%global gh_commit    e52b8672276cf436670cdd6bd5de4353740e83b2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.0
+%global upstream_version 2.8.1
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -81,7 +81,7 @@ Requires:       ca-certificates
 # Bundled libraries
 # License MIT
 Provides:       bundled(php-composer-ca-bundle) = 1.5.2
-Provides:       bundled(php-composer-class-map-generator) = 1.3.4
+Provides:       bundled(php-composer-class-map-generator) = 1.4.0
 Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
 Provides:       bundled(php-composer-pcre) = 2.3.1
 Provides:       bundled(php-composer-semver) = 3.4.3
@@ -256,6 +256,9 @@ done
 
 
 %changelog
+* Fri Oct  4 2024 Remi Collet <remi@remirepo.net> - 2.8.1-1
+- update to 2.8.1
+
 * Thu Oct  3 2024 Remi Collet <remi@remirepo.net> - 2.8.0-1
 - update to 2.8.0
 
diff --git a/sources b/sources
index 9f01048..082f406 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.0-d5e75c2.tgz) = 59df7a77432bee12d45dfe56ea46cd800aa6c48de5044a7d2edfe1c7b75f1b62cee86151a132f7ed54aa33db30dc68b612436bee51c86f986c8dcc02e1a09eca
+SHA512 (composer-2.8.1-e52b867.tgz) = 78f6f6406d7dac11cccc55458a3cd8ddd383e9b1e399562ff716c0e9cc75d76260a294fb032cf0d7f906c04746dd95c80f228abdf6eb9b20f3c2d7f9cd7988a2

From d4fcde52daef0cc5558fd40e1bc8103c0e4e5faf Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Oct 2024 07:37:38 +0100
Subject: [PATCH 251/269] v2.8.2

---
 composer-bash-completion |  2 +-
 composer.spec            | 80 ++++++++++++++++++++++------------------
 sources                  |  2 +-
 3 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 68f0ea2..7a9b48d 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.1")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.2")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index ee53d8b..a019ef0 100644
--- a/composer.spec
+++ b/composer.spec
@@ -7,10 +7,10 @@
 # Please, preserve the changelog entries
 #
 
-# For compatibility with SCL
-%undefine __brp_mangle_shebangs
 
-%global gh_commit    e52b8672276cf436670cdd6bd5de4353740e83b2
+%bcond_with          generators
+
+%global gh_commit    6e543d03187c882ea1c6ba43add2467754427803
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.1
+%global upstream_version 2.8.2
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -40,7 +40,7 @@ Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}
 Source1:        %{name}-bash-completion
 Source3:        %{name}.sh
 Source4:        %{name}.csh
-# Get a git snapshot to retrieve the test suite
+# Create a git snapshot with dependencies
 Source5:        makesrc.sh
 
 # Use our autoloader, resources path, fix for tests
@@ -54,6 +54,9 @@ BuildRequires:  php(language) >= 7.2.5
 BuildRequires:  php-cli
 BuildRequires:  php-json
 BuildRequires:  pkgconfig(bash-completion)
+%if %{with generators}
+BuildRequires:  composer-generators
+%endif
 
 # From composer.json, "require": {
 #        "php": "^7.2.5 || ^8.0",
@@ -78,36 +81,6 @@ Requires:       php(language)                           >= 7.2.5
 Requires:       php-cli
 # System certificates
 Requires:       ca-certificates
-# Bundled libraries
-# License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.5.2
-Provides:       bundled(php-composer-class-map-generator) = 1.4.0
-Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
-Provides:       bundled(php-composer-pcre) = 2.3.1
-Provides:       bundled(php-composer-semver) = 3.4.3
-Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
-Provides:       bundled(php-composer-xdebug-handler) = 3.0.5
-Provides:       bundled(php-justinrainbow-json-schema) = 5.3.0
-Provides:       bundled(php-psr-container) = 1.1.1
-Provides:       bundled(php-psr-log) = 1.1.4
-Provides:       bundled(php-react-promise) = v3.2.0
-Provides:       bundled(php-seld-jsonlint) = 1.11.0
-Provides:       bundled(php-seld-phar-utils) = 1.2.1
-Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.44
-Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.3
-Provides:       bundled(php-symfony-filesystem) = v5.4.44
-Provides:       bundled(php-symfony-finder) = v5.4.43
-Provides:       bundled(php-symfony-polyfill-ctype) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-mbstring) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-php73) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-php80) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-php81) = v1.31.0
-Provides:       bundled(php-symfony-process) = v5.4.44
-Provides:       bundled(php-symfony-service-contracts) = v2.5.3
-Provides:       bundled(php-symfony-string) = v5.4.44
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -138,8 +111,40 @@ Requires:       php-tokenizer
 Requires:       php-xsl
 Requires:       php-zlib
 
+# Bundled libraries
+%if %{without generators}
+# License MIT
+Provides:       bundled(php-composer-ca-bundle) = 1.5.2
+Provides:       bundled(php-composer-class-map-generator) = 1.4.0
+Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
+Provides:       bundled(php-composer-pcre) = 2.3.1
+Provides:       bundled(php-composer-semver) = 3.4.3
+Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
+Provides:       bundled(php-composer-xdebug-handler) = 3.0.5
+Provides:       bundled(php-justinrainbow-json-schema) = 5.3.0
+Provides:       bundled(php-psr-container) = 1.1.1
+Provides:       bundled(php-psr-log) = 1.1.4
+Provides:       bundled(php-react-promise) = v3.2.0
+Provides:       bundled(php-seld-jsonlint) = 1.11.0
+Provides:       bundled(php-seld-phar-utils) = 1.2.1
+Provides:       bundled(php-seld-signal-handler) = 2.0.2
+Provides:       bundled(php-symfony-console) = v5.4.45
+Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.3
+Provides:       bundled(php-symfony-filesystem) = v5.4.45
+Provides:       bundled(php-symfony-finder) = v5.4.45
+Provides:       bundled(php-symfony-polyfill-ctype) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-mbstring) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-php73) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-php80) = v1.31.0
+Provides:       bundled(php-symfony-polyfill-php81) = v1.31.0
+Provides:       bundled(php-symfony-process) = v5.4.45
+Provides:       bundled(php-symfony-service-contracts) = v2.5.3
+Provides:       bundled(php-symfony-string) = v5.4.45
 # Composer library
 Provides:       php-composer(composer/composer) = %{version}
+%endif
 # Special internal for Plugin API
 Provides:       php-composer(composer-plugin-api) = %{api_version}
 Provides:       php-composer(composer-runtime-api) = %{run_version}
@@ -173,6 +178,7 @@ ln -s vendor/autoload.php src/Composer/autoload.php
 : fix layout
 sed -e "s:/../..' . '/src/Composer::" -i src/Composer/vendor/composer/autoload_static.php
 
+%if %{without generators}
 : List bundled libraries and Licenses
 php -r '
 	$pkgs = file_get_contents("src/Composer/vendor/composer/installed.json");
@@ -192,6 +198,7 @@ php -r '
 		printf("# License %s\n%s\n", $lic, implode("\n", $lib));
 	}
 '
+%endif
 
 : fix reported version
 sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \
@@ -256,6 +263,9 @@ done
 
 
 %changelog
+* Wed Oct 30 2024 Remi Collet <remi@remirepo.net> - 2.8.2-1
+- update to 2.8.2
+
 * Fri Oct  4 2024 Remi Collet <remi@remirepo.net> - 2.8.1-1
 - update to 2.8.1
 
diff --git a/sources b/sources
index 082f406..8da6004 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.1-e52b867.tgz) = 78f6f6406d7dac11cccc55458a3cd8ddd383e9b1e399562ff716c0e9cc75d76260a294fb032cf0d7f906c04746dd95c80f228abdf6eb9b20f3c2d7f9cd7988a2
+SHA512 (composer-2.8.2-6e543d0.tgz) = 01da8edd05e0886bd289657722001d5aa3456ee2a56e4fd54a2a7e129d47d7b4543f272a984258df7599cc9da713f4d39c4fce64dc0b2de3c7a360fb6e294c49

From 4f7bdd0f218897cfd2ebae87d70e66de8b8f8d16 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Oct 2024 08:07:41 +0100
Subject: [PATCH 252/269] fix diagnose command

---
 composer.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index a019ef0..6f85e80 100644
--- a/composer.spec
+++ b/composer.spec
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -176,7 +176,10 @@ rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem
 ln -s vendor/autoload.php src/Composer/autoload.php
 
 : fix layout
-sed -e "s:/../..' . '/src/Composer::" -i src/Composer/vendor/composer/autoload_static.php
+sed -e "s:/../..' . '/src/Composer::" \
+    -i src/Composer/vendor/composer/autoload_static.php
+sed -e "s:../../vendor:vendor:" \
+    -i src/Composer/Command/DiagnoseCommand.php src/Composer/Compiler.php
 
 %if %{without generators}
 : List bundled libraries and Licenses
@@ -263,8 +266,9 @@ done
 
 
 %changelog
-* Wed Oct 30 2024 Remi Collet <remi@remirepo.net> - 2.8.2-1
+* Wed Oct 30 2024 Remi Collet <remi@remirepo.net> - 2.8.2-2
 - update to 2.8.2
+- fix diagnose command
 
 * Fri Oct  4 2024 Remi Collet <remi@remirepo.net> - 2.8.1-1
 - update to 2.8.1

From c90124e643b7f928bf2c68144c93f0f39ad87790 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Oct 2024 10:25:09 +0100
Subject: [PATCH 253/269] keep upstream layout for simplicity

---
 composer-noxdg.patch |  4 +--
 composer-rpm.patch   | 59 +++--------------------------------------
 composer.spec        | 62 +++++++++++++++++++++++---------------------
 makesrc.sh           |  7 ++---
 4 files changed, 42 insertions(+), 90 deletions(-)

diff --git a/composer-noxdg.patch b/composer-noxdg.patch
index 8971527..2927848 100644
--- a/composer-noxdg.patch
+++ b/composer-noxdg.patch
@@ -1,11 +1,11 @@
 diff -up ./src/Composer/Factory.php.noxdg ./src/Composer/Factory.php
 --- ./src/Composer/Factory.php.noxdg	2024-04-20 12:34:54.442117723 +0200
 +++ ./src/Composer/Factory.php	2024-04-20 12:35:39.497640757 +0200
-@@ -680,6 +680,10 @@ class Factory
+@@ -702,6 +702,10 @@ class Factory
  
      private static function useXdg(): bool
      {
-+        // As XDG is very patially implemted
++        // As XDG is very partially implemented
 +        // resulting in command/code in ~/.config
 +        return false;
 +
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 52ed07b..fdc97ac 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -6,34 +6,10 @@ diff -up ./bin/composer.rpm ./bin/composer
  
  setlocale(LC_ALL, 'C');
 -require __DIR__.'/../src/bootstrap.php';
-+require '/usr/share/php/Composer/autoload.php';
++require '/usr/share/composer/src/bootstrap.php';
  
  use Composer\Console\Application;
  use Composer\XdebugHandler\XdebugHandler;
-diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2024-10-03 07:10:57.000000000 +0200
-+++ ./src/Composer/Autoload/AutoloadGenerator.php	2024-10-03 07:11:10.752092401 +0200
-@@ -458,7 +458,7 @@ EOF;
-         $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $checkPlatform));
- 
-         $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
--        $filesystem->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
-+        $filesystem->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE');
- 
-         if ($this->runScripts) {
-             $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, [], [
-diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm	2024-10-03 07:10:57.000000000 +0200
-+++ ./src/Composer/Compiler.php	2024-10-03 07:11:10.752092401 +0200
-@@ -105,7 +105,7 @@ class Compiler
-         // Add Composer resources
-         $finder = new Finder();
-         $finder->files()
--            ->in(__DIR__.'/../../res')
-+            ->in((getenv('BUILDROOT')?:'') . '/usr/share/composer/res')
-             ->sort($finderSort)
-         ;
-         foreach ($finder as $file) {
 diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersions.php
 --- ./src/Composer/InstalledVersions.php.rpm	2024-10-03 07:10:57.000000000 +0200
 +++ ./src/Composer/InstalledVersions.php	2024-10-03 07:11:10.752092401 +0200
@@ -55,36 +31,9 @@ diff -up ./src/Composer/InstalledVersions.php.rpm ./src/Composer/InstalledVersio
                  /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                  $required = require __DIR__ . '/installed.php';
                  self::$installed = $required;
-diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2024-10-03 07:11:10.752092401 +0200
-+++ ./src/Composer/Json/JsonFile.php	2024-10-03 07:14:54.219192080 +0200
-@@ -41,8 +41,8 @@ class JsonFile
-     /** @deprecated Use \JSON_UNESCAPED_UNICODE */
-     public const JSON_UNESCAPED_UNICODE = 256;
- 
--    public const COMPOSER_SCHEMA_PATH = __DIR__ . '/../../../res/composer-schema.json';
--    public const LOCK_SCHEMA_PATH = __DIR__ . '/../../../res/composer-lock-schema.json';
-+    public const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json';
-+    public const LOCK_SCHEMA_PATH = '/usr/share/composer/res/composer-lock-schema.json';
- 
-     public const INDENT_DEFAULT = '    ';
- 
-@@ -231,10 +231,10 @@ class JsonFile
-         $isComposerSchemaFile = false;
-         if (null === $schemaFile) {
-             if ($schema === self::LOCK_SCHEMA) {
--                $schemaFile = self::LOCK_SCHEMA_PATH;
-+                $schemaFile = (getenv('BUILDROOT')?:'') . self::LOCK_SCHEMA_PATH;
-             } else {
-                 $isComposerSchemaFile = true;
--                $schemaFile = self::COMPOSER_SCHEMA_PATH;
-+                $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH;
-             }
-         }
- 
-diff -up ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php
---- ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php.rpm	2024-09-25 09:49:53.000000000 +0200
-+++ ./src/Composer/vendor/composer/ca-bundle/src/CaBundle.php	2024-10-03 07:11:10.752092401 +0200
+diff -up ./vendor/composer/ca-bundle/src/CaBundle.php.rpm ./vendor/composer/ca-bundle/src/CaBundle.php
+--- ./vendor/composer/ca-bundle/src/CaBundle.php.rpm	2024-09-25 09:49:53.000000000 +0200
++++ ./vendor/composer/ca-bundle/src/CaBundle.php	2024-10-03 07:11:10.752092401 +0200
 @@ -125,7 +125,7 @@ class CaBundle
       */
      public static function getBundledCaBundlePath()
diff --git a/composer.spec b/composer.spec
index 6f85e80..8323ea9 100644
--- a/composer.spec
+++ b/composer.spec
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -164,27 +164,12 @@ Documentation: https://getcomposer.org/doc/
 %patch -P1 -p1 -b .noxdg
 find . \( -name \*.rpm -o -name \*noxdg \) -delete -print
 
-if grep -r '\.\./res'; then
-	: Patch need to fixed
-	exit 1
-fi
-
-rm src/bootstrap.php
-rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem
-
-: symlink autoloader for library
-ln -s vendor/autoload.php src/Composer/autoload.php
-
-: fix layout
-sed -e "s:/../..' . '/src/Composer::" \
-    -i src/Composer/vendor/composer/autoload_static.php
-sed -e "s:../../vendor:vendor:" \
-    -i src/Composer/Command/DiagnoseCommand.php src/Composer/Compiler.php
+rm vendor/composer/ca-bundle/res/cacert.pem
 
 %if %{without generators}
 : List bundled libraries and Licenses
 php -r '
-	$pkgs = file_get_contents("src/Composer/vendor/composer/installed.json");
+	$pkgs = file_get_contents("vendor/composer/installed.json");
 	$pkgs = json_decode($pkgs, true);
 	if (!is_array($pkgs) || !isset($pkgs["packages"])) {
         echo "cant decode json file\n";
@@ -210,7 +195,7 @@ sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \
 : check Plugin API version
 php -r '
 namespace Composer;
-include "src/Composer/autoload.php";
+include "src/bootstrap.php";
 if (version_compare(Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) {
   printf("Plugin API version is %s, expected %s\n", Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}");
   exit(1);
@@ -222,7 +207,7 @@ if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) {
 
 
 %build
-# Nothing
+: Nothing to build
 
 
 %install
@@ -231,32 +216,46 @@ install -Dpm 644 %{SOURCE1} %{buildroot}%{bashcompdir}/%{name}
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/
 
-: Library
-mkdir -p     %{buildroot}%{_datadir}/php
-cp -pr src/* %{buildroot}%{_datadir}/php
+: Library autoloader for compatibility
+mkdir -p     %{buildroot}%{_datadir}/php/Composer
+ln -s ../../composer/vendor/autoload.php %{buildroot}%{_datadir}/php/Composer/autoload.php
 
-: Resources
-mkdir -p       %{buildroot}%{_datadir}/%{name}
-cp -pr res     %{buildroot}%{_datadir}/%{name}/res
-cp -p  LICENSE %{buildroot}%{_datadir}/%{name}/LICENSE
+: Sources
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -pr src res vendor LICENSE\
+         %{buildroot}%{_datadir}/%{name}/
 
 : Command
 install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
 : Licenses
 ln -sf ../../%{name}/LICENSE LICENSE
-cd src/Composer/vendor
+cd vendor
 for lic in */*/LICENSE
 do dir=$(dirname $lic)
    own=$(dirname $dir)
    prj=$(basename $dir)
-   ln -sf ../../php/Composer/vendor/$own/$prj/LICENSE ../../../$own-$prj-LICENSE
+   ln -sf ../../composer/vendor/$own/$prj/LICENSE ../$own-$prj-LICENSE
 done
 
 
+%check
+: Check autoloader
+php -r '
+  include "%{buildroot}%{_datadir}/%{name}/src/bootstrap.php";
+  exit (class_exists("Composer\\Composer") ? 0 : 1);
+'
+: Check compatibility autoloader
+php -r '
+  include "%{buildroot}%{_datadir}/php/Composer/autoload.php";
+  exit (class_exists("Composer\\Composer") ? 0 : 2);
+'
+
+
 %files
 %license *LICENSE
-%doc *.md doc
+%doc *.md
+%doc doc
 %doc composer.json
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*
 %{_bindir}/%{name}
@@ -266,6 +265,9 @@ done
 
 
 %changelog
+* Wed Oct 30 2024 Remi Collet <remi@remirepo.net> - 2.8.2-3
+- keep upstream layout for simplicity
+
 * Wed Oct 30 2024 Remi Collet <remi@remirepo.net> - 2.8.2-2
 - update to 2.8.2
 - fix diagnose command
diff --git a/makesrc.sh b/makesrc.sh
index 930ec0b..dc25efb 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -8,7 +8,7 @@ PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec)
 COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
 SHORT=${COMMIT:0:7}
 
-if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz ]; then
+if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz -a "$1" != "-f" ]; then
 	echo skip $NAME-$VERSION$PREVER-$SHORT.tgz already here
 else
 	echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n"
@@ -22,9 +22,10 @@ else
 		cp composer.json ../composer.json
 		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
-		cp src/Composer/vendor/composer/installed.json ../
+		cp vendor/composer/installed.json ../
+		# bash completion
+		bin/composer completion bash >../composer-bash-completion
 	popd
 
 	echo "Archiving..."

From 8114a124b14b2ee2027a8e8ccd10b871f7e0322c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Oct 2024 10:39:11 +0100
Subject: [PATCH 254/269] refresh sources

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 8da6004..5a85c94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.2-6e543d0.tgz) = 01da8edd05e0886bd289657722001d5aa3456ee2a56e4fd54a2a7e129d47d7b4543f272a984258df7599cc9da713f4d39c4fce64dc0b2de3c7a360fb6e294c49
+SHA512 (composer-2.8.2-6e543d0.tgz) = 442fb529026909f6be6ccd2a179d6c5ff8cfa5915e3e9c4029a56348dd65bf09d87d1fd384b91aa1ab6d76f406c2b89d5fdec76bad04ae93e52f962af94da117

From b626a00179f5007034c841596aa00582521d074d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 18 Nov 2024 09:36:01 +0100
Subject: [PATCH 255/269] v2.8.3

---
 composer.spec | 67 +++++++++++++++++++++++++++------------------------
 sources       |  2 +-
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/composer.spec b/composer.spec
index 8323ea9..4ebdb5b 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
 
 %bcond_with          generators
 
-%global gh_commit    6e543d03187c882ea1c6ba43add2467754427803
+%global gh_commit    2a7c71266b2545a3bed9f4860734081963f6e688
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.2
+%global upstream_version 2.8.3
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -114,34 +114,34 @@ Requires:       php-zlib
 # Bundled libraries
 %if %{without generators}
 # License MIT
-Provides:       bundled(php-composer-ca-bundle) = 1.5.2
-Provides:       bundled(php-composer-class-map-generator) = 1.4.0
-Provides:       bundled(php-composer-metadata-minifier) = 1.0.0
-Provides:       bundled(php-composer-pcre) = 2.3.1
-Provides:       bundled(php-composer-semver) = 3.4.3
-Provides:       bundled(php-composer-spdx-licenses) = 1.5.8
-Provides:       bundled(php-composer-xdebug-handler) = 3.0.5
-Provides:       bundled(php-justinrainbow-json-schema) = 5.3.0
-Provides:       bundled(php-psr-container) = 1.1.1
-Provides:       bundled(php-psr-log) = 1.1.4
-Provides:       bundled(php-react-promise) = v3.2.0
-Provides:       bundled(php-seld-jsonlint) = 1.11.0
-Provides:       bundled(php-seld-phar-utils) = 1.2.1
-Provides:       bundled(php-seld-signal-handler) = 2.0.2
-Provides:       bundled(php-symfony-console) = v5.4.45
-Provides:       bundled(php-symfony-deprecation-contracts) = v2.5.3
-Provides:       bundled(php-symfony-filesystem) = v5.4.45
-Provides:       bundled(php-symfony-finder) = v5.4.45
-Provides:       bundled(php-symfony-polyfill-ctype) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-intl-grapheme) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-intl-normalizer) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-mbstring) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-php73) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-php80) = v1.31.0
-Provides:       bundled(php-symfony-polyfill-php81) = v1.31.0
-Provides:       bundled(php-symfony-process) = v5.4.45
-Provides:       bundled(php-symfony-service-contracts) = v2.5.3
-Provides:       bundled(php-symfony-string) = v5.4.45
+Provides:       bundled(php-composer(composer/ca-bundle)) = 1.5.3
+Provides:       bundled(php-composer(composer/class-map-generator)) = 1.4.0
+Provides:       bundled(php-composer(composer/metadata-minifier)) = 1.0.0
+Provides:       bundled(php-composer(composer/pcre)) = 2.3.2
+Provides:       bundled(php-composer(composer/semver)) = 3.4.3
+Provides:       bundled(php-composer(composer/spdx-licenses)) = 1.5.8
+Provides:       bundled(php-composer(composer/xdebug-handler)) = 3.0.5
+Provides:       bundled(php-composer(justinrainbow/json-schema)) = 5.3.0
+Provides:       bundled(php-composer(psr/container)) = 1.1.1
+Provides:       bundled(php-composer(psr/log)) = 1.1.4
+Provides:       bundled(php-composer(react/promise)) = v3.2.0
+Provides:       bundled(php-composer(seld/jsonlint)) = 1.11.0
+Provides:       bundled(php-composer(seld/phar-utils)) = 1.2.1
+Provides:       bundled(php-composer(seld/signal-handler)) = 2.0.2
+Provides:       bundled(php-composer(symfony/console)) = v5.4.47
+Provides:       bundled(php-composer(symfony/deprecation-contracts)) = v2.5.3
+Provides:       bundled(php-composer(symfony/filesystem)) = v5.4.45
+Provides:       bundled(php-composer(symfony/finder)) = v5.4.45
+Provides:       bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-php73)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-php80)) = v1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-php81)) = v1.31.0
+Provides:       bundled(php-composer(symfony/process)) = v5.4.47
+Provides:       bundled(php-composer(symfony/service-contracts)) = v2.5.3
+Provides:       bundled(php-composer(symfony/string)) = v5.4.47
 # Composer library
 Provides:       php-composer(composer/composer) = %{version}
 %endif
@@ -179,7 +179,7 @@ php -r '
     foreach($pkgs["packages"] as $pkg) {
 		$lic = implode(" and ", $pkg["license"]);
 		if (!isset($res[$lic])) $res[$lic] = [];
-		$res[$lic][] = sprintf("Provides:       bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]);
+		$res[$lic][] = sprintf("Provides:       bundled(php-composer(%s)) = %s", $pkg["name"], $pkg["version"]);
 	}
 	foreach($res as $lic => $lib) {
 		sort($lib);
@@ -265,6 +265,9 @@ php -r '
 
 
 %changelog
+* Mon Nov 18 2024 Remi Collet <remi@remirepo.net> - 2.8.3-1
+- update to 2.8.3
+
 * Wed Oct 30 2024 Remi Collet <remi@remirepo.net> - 2.8.2-3
 - keep upstream layout for simplicity
 
diff --git a/sources b/sources
index 5a85c94..ec9255c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.2-6e543d0.tgz) = 442fb529026909f6be6ccd2a179d6c5ff8cfa5915e3e9c4029a56348dd65bf09d87d1fd384b91aa1ab6d76f406c2b89d5fdec76bad04ae93e52f962af94da117
+SHA512 (composer-2.8.3-2a7c712.tgz) = 3fa1687527d531cb83f1f269825ca8d213f59990532542f08021f6bcdb6d56539ac874810e609f541f12e19c26541a44c98f9d39a3757056f2f1c80a4356159e

From 1a4995644a7cc8a40def8cac91a009d6ee0487aa Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 11 Dec 2024 13:59:01 +0100
Subject: [PATCH 256/269] update to 2.8.4

re-license spec file to CECILL-2.1
---
 composer-bash-completion |  2 +-
 composer.spec            | 22 +++++++++++++---------
 sources                  |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 7a9b48d..8aa8c87 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.2")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.4")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 4ebdb5b..be27ce7 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,8 +1,8 @@
 # remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015-2024 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText:  Copyright 2024 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #
@@ -10,7 +10,7 @@
 
 %bcond_with          generators
 
-%global gh_commit    2a7c71266b2545a3bed9f4860734081963f6e688
+%global gh_commit    112e37d1dca22b3fdb81cf3524ab4994f47fdb8c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.3
+%global upstream_version 2.8.4
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -114,8 +114,8 @@ Requires:       php-zlib
 # Bundled libraries
 %if %{without generators}
 # License MIT
-Provides:       bundled(php-composer(composer/ca-bundle)) = 1.5.3
-Provides:       bundled(php-composer(composer/class-map-generator)) = 1.4.0
+Provides:       bundled(php-composer(composer/ca-bundle)) = 1.5.4
+Provides:       bundled(php-composer(composer/class-map-generator)) = 1.5.0
 Provides:       bundled(php-composer(composer/metadata-minifier)) = 1.0.0
 Provides:       bundled(php-composer(composer/pcre)) = 2.3.2
 Provides:       bundled(php-composer(composer/semver)) = 3.4.3
@@ -129,7 +129,7 @@ Provides:       bundled(php-composer(seld/jsonlint)) = 1.11.0
 Provides:       bundled(php-composer(seld/phar-utils)) = 1.2.1
 Provides:       bundled(php-composer(seld/signal-handler)) = 2.0.2
 Provides:       bundled(php-composer(symfony/console)) = v5.4.47
-Provides:       bundled(php-composer(symfony/deprecation-contracts)) = v2.5.3
+Provides:       bundled(php-composer(symfony/deprecation-contracts)) = v2.5.4
 Provides:       bundled(php-composer(symfony/filesystem)) = v5.4.45
 Provides:       bundled(php-composer(symfony/finder)) = v5.4.45
 Provides:       bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0
@@ -140,7 +140,7 @@ Provides:       bundled(php-composer(symfony/polyfill-php73)) = v1.31.0
 Provides:       bundled(php-composer(symfony/polyfill-php80)) = v1.31.0
 Provides:       bundled(php-composer(symfony/polyfill-php81)) = v1.31.0
 Provides:       bundled(php-composer(symfony/process)) = v5.4.47
-Provides:       bundled(php-composer(symfony/service-contracts)) = v2.5.3
+Provides:       bundled(php-composer(symfony/service-contracts)) = v2.5.4
 Provides:       bundled(php-composer(symfony/string)) = v5.4.47
 # Composer library
 Provides:       php-composer(composer/composer) = %{version}
@@ -265,6 +265,10 @@ php -r '
 
 
 %changelog
+* Wed Dec 11 2024 Remi Collet <remi@remirepo.net> - 2.8.4-1
+- update to 2.8.4
+- re-license spec file to CECILL-2.1
+
 * Mon Nov 18 2024 Remi Collet <remi@remirepo.net> - 2.8.3-1
 - update to 2.8.3
 
diff --git a/sources b/sources
index ec9255c..dbce972 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.3-2a7c712.tgz) = 3fa1687527d531cb83f1f269825ca8d213f59990532542f08021f6bcdb6d56539ac874810e609f541f12e19c26541a44c98f9d39a3757056f2f1c80a4356159e
+SHA512 (composer-2.8.4-112e37d.tgz) = 3c5331460a31d3e3c52f6248063bcca85e0d0aeb5c581f0892f1ed63fd4610553e52be5e3dd802c0bf594b59c4d02aa356c16c5df14067e51420deb0951c47a3

From f771771690eb676302119da8273c9db4e9028579 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 14:22:03 +0000
Subject: [PATCH 257/269] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index be27ce7..b9a302c 100644
--- a/composer.spec
+++ b/composer.spec
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -265,6 +265,9 @@ php -r '
 
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Dec 11 2024 Remi Collet <remi@remirepo.net> - 2.8.4-1
 - update to 2.8.4
 - re-license spec file to CECILL-2.1

From 37b5f986cca66b20aa3172845f7edca03e6c6c59 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 21 Jan 2025 16:11:24 +0100
Subject: [PATCH 258/269] v2.8.5

---
 composer-bash-completion |  2 +-
 composer.spec            | 45 +++++++++++++++++++++-------------------
 sources                  |  2 +-
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 8aa8c87..cea3084 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.4")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.5")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index b9a302c..3eb7827 100644
--- a/composer.spec
+++ b/composer.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for composer
 #
-# SPDX-FileCopyrightText:  Copyright 2024 Remi Collet
+# SPDX-FileCopyrightText:  Copyright 2015-2025 Remi Collet
 # SPDX-License-Identifier: CECILL-2.1
 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
@@ -10,7 +10,7 @@
 
 %bcond_with          generators
 
-%global gh_commit    112e37d1dca22b3fdb81cf3524ab4994f47fdb8c
+%global gh_commit    ae208dc1e182bd45d99fcecb956501da212454a1
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +18,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.4
+%global upstream_version 2.8.5
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -29,7 +29,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -114,7 +114,7 @@ Requires:       php-zlib
 # Bundled libraries
 %if %{without generators}
 # License MIT
-Provides:       bundled(php-composer(composer/ca-bundle)) = 1.5.4
+Provides:       bundled(php-composer(composer/ca-bundle)) = 1.5.5
 Provides:       bundled(php-composer(composer/class-map-generator)) = 1.5.0
 Provides:       bundled(php-composer(composer/metadata-minifier)) = 1.0.0
 Provides:       bundled(php-composer(composer/pcre)) = 2.3.2
@@ -124,24 +124,24 @@ Provides:       bundled(php-composer(composer/xdebug-handler)) = 3.0.5
 Provides:       bundled(php-composer(justinrainbow/json-schema)) = 5.3.0
 Provides:       bundled(php-composer(psr/container)) = 1.1.1
 Provides:       bundled(php-composer(psr/log)) = 1.1.4
-Provides:       bundled(php-composer(react/promise)) = v3.2.0
+Provides:       bundled(php-composer(react/promise)) = 3.2.0
 Provides:       bundled(php-composer(seld/jsonlint)) = 1.11.0
 Provides:       bundled(php-composer(seld/phar-utils)) = 1.2.1
 Provides:       bundled(php-composer(seld/signal-handler)) = 2.0.2
-Provides:       bundled(php-composer(symfony/console)) = v5.4.47
-Provides:       bundled(php-composer(symfony/deprecation-contracts)) = v2.5.4
-Provides:       bundled(php-composer(symfony/filesystem)) = v5.4.45
-Provides:       bundled(php-composer(symfony/finder)) = v5.4.45
-Provides:       bundled(php-composer(symfony/polyfill-ctype)) = v1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-intl-grapheme)) = v1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-intl-normalizer)) = v1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-mbstring)) = v1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-php73)) = v1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-php80)) = v1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-php81)) = v1.31.0
-Provides:       bundled(php-composer(symfony/process)) = v5.4.47
-Provides:       bundled(php-composer(symfony/service-contracts)) = v2.5.4
-Provides:       bundled(php-composer(symfony/string)) = v5.4.47
+Provides:       bundled(php-composer(symfony/console)) = 5.4.47
+Provides:       bundled(php-composer(symfony/deprecation-contracts)) = 2.5.4
+Provides:       bundled(php-composer(symfony/filesystem)) = 5.4.45
+Provides:       bundled(php-composer(symfony/finder)) = 5.4.45
+Provides:       bundled(php-composer(symfony/polyfill-ctype)) = 1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-php73)) = 1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-php80)) = 1.31.0
+Provides:       bundled(php-composer(symfony/polyfill-php81)) = 1.31.0
+Provides:       bundled(php-composer(symfony/process)) = 5.4.47
+Provides:       bundled(php-composer(symfony/service-contracts)) = 2.5.4
+Provides:       bundled(php-composer(symfony/string)) = 5.4.47
 # Composer library
 Provides:       php-composer(composer/composer) = %{version}
 %endif
@@ -179,7 +179,7 @@ php -r '
     foreach($pkgs["packages"] as $pkg) {
 		$lic = implode(" and ", $pkg["license"]);
 		if (!isset($res[$lic])) $res[$lic] = [];
-		$res[$lic][] = sprintf("Provides:       bundled(php-composer(%s)) = %s", $pkg["name"], $pkg["version"]);
+		$res[$lic][] = sprintf("Provides:       bundled(php-composer(%s)) = %s", $pkg["name"], trim($pkg["version"], "v"));
 	}
 	foreach($res as $lic => $lib) {
 		sort($lib);
@@ -265,6 +265,9 @@ php -r '
 
 
 %changelog
+* Tue Jan 21 2025 Remi Collet <remi@remirepo.net> - 2.8.5-1
+- update to 2.8.5
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 
diff --git a/sources b/sources
index dbce972..22e1949 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.4-112e37d.tgz) = 3c5331460a31d3e3c52f6248063bcca85e0d0aeb5c581f0892f1ed63fd4610553e52be5e3dd802c0bf594b59c4d02aa356c16c5df14067e51420deb0951c47a3
+SHA512 (composer-2.8.5-ae208dc.tgz) = 9ebeefcc814dccfa44419609d00f8e01b71749e5f2195b788d6d2489bd77f2372e9f72bfbca4a2b6ea9ea2aa20319a164d2377aa1c00bc0b4b8804c398c45dcd

From ae6d3b3084d75ccf8d76a915634d82697836c5de Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 25 Feb 2025 15:38:39 +0100
Subject: [PATCH 259/269] v2.8.6

---
 composer-bash-completion |  2 +-
 composer.spec            | 67 +++-------------------------------------
 sources                  |  2 +-
 3 files changed, 7 insertions(+), 64 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index cea3084..462f753 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.5")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.6")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 3eb7827..035eb9c 100644
--- a/composer.spec
+++ b/composer.spec
@@ -8,9 +8,7 @@
 #
 
 
-%bcond_with          generators
-
-%global gh_commit    ae208dc1e182bd45d99fcecb956501da212454a1
+%global gh_commit    937c775a644bd7d2c3dfbb352747488463a6e673
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -18,7 +16,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.5
+%global upstream_version 2.8.6
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -54,9 +52,7 @@ BuildRequires:  php(language) >= 7.2.5
 BuildRequires:  php-cli
 BuildRequires:  php-json
 BuildRequires:  pkgconfig(bash-completion)
-%if %{with generators}
 BuildRequires:  composer-generators
-%endif
 
 # From composer.json, "require": {
 #        "php": "^7.2.5 || ^8.0",
@@ -111,40 +107,6 @@ Requires:       php-tokenizer
 Requires:       php-xsl
 Requires:       php-zlib
 
-# Bundled libraries
-%if %{without generators}
-# License MIT
-Provides:       bundled(php-composer(composer/ca-bundle)) = 1.5.5
-Provides:       bundled(php-composer(composer/class-map-generator)) = 1.5.0
-Provides:       bundled(php-composer(composer/metadata-minifier)) = 1.0.0
-Provides:       bundled(php-composer(composer/pcre)) = 2.3.2
-Provides:       bundled(php-composer(composer/semver)) = 3.4.3
-Provides:       bundled(php-composer(composer/spdx-licenses)) = 1.5.8
-Provides:       bundled(php-composer(composer/xdebug-handler)) = 3.0.5
-Provides:       bundled(php-composer(justinrainbow/json-schema)) = 5.3.0
-Provides:       bundled(php-composer(psr/container)) = 1.1.1
-Provides:       bundled(php-composer(psr/log)) = 1.1.4
-Provides:       bundled(php-composer(react/promise)) = 3.2.0
-Provides:       bundled(php-composer(seld/jsonlint)) = 1.11.0
-Provides:       bundled(php-composer(seld/phar-utils)) = 1.2.1
-Provides:       bundled(php-composer(seld/signal-handler)) = 2.0.2
-Provides:       bundled(php-composer(symfony/console)) = 5.4.47
-Provides:       bundled(php-composer(symfony/deprecation-contracts)) = 2.5.4
-Provides:       bundled(php-composer(symfony/filesystem)) = 5.4.45
-Provides:       bundled(php-composer(symfony/finder)) = 5.4.45
-Provides:       bundled(php-composer(symfony/polyfill-ctype)) = 1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-intl-grapheme)) = 1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-intl-normalizer)) = 1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-mbstring)) = 1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-php73)) = 1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-php80)) = 1.31.0
-Provides:       bundled(php-composer(symfony/polyfill-php81)) = 1.31.0
-Provides:       bundled(php-composer(symfony/process)) = 5.4.47
-Provides:       bundled(php-composer(symfony/service-contracts)) = 2.5.4
-Provides:       bundled(php-composer(symfony/string)) = 5.4.47
-# Composer library
-Provides:       php-composer(composer/composer) = %{version}
-%endif
 # Special internal for Plugin API
 Provides:       php-composer(composer-plugin-api) = %{api_version}
 Provides:       php-composer(composer-runtime-api) = %{run_version}
@@ -166,28 +128,6 @@ find . \( -name \*.rpm -o -name \*noxdg \) -delete -print
 
 rm vendor/composer/ca-bundle/res/cacert.pem
 
-%if %{without generators}
-: List bundled libraries and Licenses
-php -r '
-	$pkgs = file_get_contents("vendor/composer/installed.json");
-	$pkgs = json_decode($pkgs, true);
-	if (!is_array($pkgs) || !isset($pkgs["packages"])) {
-        echo "cant decode json file\n";
-		exit(3);
-	}
-	$res = [];
-    foreach($pkgs["packages"] as $pkg) {
-		$lic = implode(" and ", $pkg["license"]);
-		if (!isset($res[$lic])) $res[$lic] = [];
-		$res[$lic][] = sprintf("Provides:       bundled(php-composer(%s)) = %s", $pkg["name"], trim($pkg["version"], "v"));
-	}
-	foreach($res as $lic => $lib) {
-		sort($lib);
-		printf("# License %s\n%s\n", $lic, implode("\n", $lib));
-	}
-'
-%endif
-
 : fix reported version
 sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \
     -i src/Composer/Composer.php
@@ -265,6 +205,9 @@ php -r '
 
 
 %changelog
+* Tue Feb 25 2025 Remi Collet <remi@remirepo.net> - 2.8.6-1
+- update to 2.8.6
+
 * Tue Jan 21 2025 Remi Collet <remi@remirepo.net> - 2.8.5-1
 - update to 2.8.5
 
diff --git a/sources b/sources
index 22e1949..19b321c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.5-ae208dc.tgz) = 9ebeefcc814dccfa44419609d00f8e01b71749e5f2195b788d6d2489bd77f2372e9f72bfbca4a2b6ea9ea2aa20319a164d2377aa1c00bc0b4b8804c398c45dcd
+SHA512 (composer-2.8.6-937c775.tgz) = 29da35ab956ca9a9d5cfd019eda52f0bcb0bf638ee244ed5c46d8de9465557350a54d30f89d62a9d2e0e9e0d0619cda9f46e101b0774871fa4c066d5cc89aa63

From a6ca5074a589b67a228ec0e47afe562adaf8231c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Apr 2025 08:51:31 +0200
Subject: [PATCH 260/269] v2.8.8

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 462f753..f31bc3a 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.6")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.8")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 035eb9c..38c263a 100644
--- a/composer.spec
+++ b/composer.spec
@@ -8,7 +8,7 @@
 #
 
 
-%global gh_commit    937c775a644bd7d2c3dfbb352747488463a6e673
+%global gh_commit    85ff84d6c5260ba21740a7c5c9a111890805d6e7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.6
+%global upstream_version 2.8.8
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -205,6 +205,9 @@ php -r '
 
 
 %changelog
+* Sat Apr  5 2025 Remi Collet <remi@remirepo.net> - 2.8.8-1
+- update to 2.8.8
+
 * Tue Feb 25 2025 Remi Collet <remi@remirepo.net> - 2.8.6-1
 - update to 2.8.6
 
diff --git a/sources b/sources
index 19b321c..d87700d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.6-937c775.tgz) = 29da35ab956ca9a9d5cfd019eda52f0bcb0bf638ee244ed5c46d8de9465557350a54d30f89d62a9d2e0e9e0d0619cda9f46e101b0774871fa4c066d5cc89aa63
+SHA512 (composer-2.8.8-85ff84d.tgz) = c6615d03b7ce75265aa2d4069a5d3cbf163503c67aa57dcf1409c49f9ddff91690ce4f939f3ec46c5a31e396424859b46a052c3d3b799676498320e728b5eeb5

From 37302d9faf98badd8a872f4487365fab89e66f76 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 13 May 2025 14:32:44 +0200
Subject: [PATCH 261/269] v2.8.9

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index f31bc3a..4ca8915 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.8")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.9")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 38c263a..625ab98 100644
--- a/composer.spec
+++ b/composer.spec
@@ -8,7 +8,7 @@
 #
 
 
-%global gh_commit    85ff84d6c5260ba21740a7c5c9a111890805d6e7
+%global gh_commit    b4e6bff2db7ce756ddb77ecee958a0f41f42bd9d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.8
+%global upstream_version 2.8.9
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -205,6 +205,9 @@ php -r '
 
 
 %changelog
+* Tue May 13 2025 Remi Collet <remi@remirepo.net> - 2.8.9-1
+- update to 2.8.9
+
 * Sat Apr  5 2025 Remi Collet <remi@remirepo.net> - 2.8.8-1
 - update to 2.8.8
 
diff --git a/sources b/sources
index d87700d..1c62e2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.8-85ff84d.tgz) = c6615d03b7ce75265aa2d4069a5d3cbf163503c67aa57dcf1409c49f9ddff91690ce4f939f3ec46c5a31e396424859b46a052c3d3b799676498320e728b5eeb5
+SHA512 (composer-2.8.9-b4e6bff.tgz) = ca74545d85272d608df910fbd6a74a3ae16816c19113f6b5430808afae73baf1eddf887b1251a71c2e527af342ffc9ec1dfdc66db42a6b629bed1149bec99f0c

From ef7a24ed26838ca0a34e0f53294b8d32487ce350 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 11 Jul 2025 07:56:05 +0200
Subject: [PATCH 262/269] v2.8.10

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 4ca8915..a14f0a3 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.9")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.10")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 625ab98..622d561 100644
--- a/composer.spec
+++ b/composer.spec
@@ -8,7 +8,7 @@
 #
 
 
-%global gh_commit    b4e6bff2db7ce756ddb77ecee958a0f41f42bd9d
+%global gh_commit    53834f587d7ab2527eb237459d7b94d1fb9d4c5a
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.9
+%global upstream_version 2.8.10
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -205,6 +205,9 @@ php -r '
 
 
 %changelog
+* Fri Jul 11 2025 Remi Collet <remi@remirepo.net> - 2.8.10-1
+- update to 2.8.10
+
 * Tue May 13 2025 Remi Collet <remi@remirepo.net> - 2.8.9-1
 - update to 2.8.9
 
diff --git a/sources b/sources
index 1c62e2f..d1b23eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.9-b4e6bff.tgz) = ca74545d85272d608df910fbd6a74a3ae16816c19113f6b5430808afae73baf1eddf887b1251a71c2e527af342ffc9ec1dfdc66db42a6b629bed1149bec99f0c
+SHA512 (composer-2.8.10-53834f5.tgz) = 34a7a8816b3f8a54a2cab804d3af612ada3291fe69abd948113151de578c3eb1c052b6552cc1d18ec7a9c88a2ed26f3c24af53d93c4111e09c8309b2cbeef3c8

From 7d19c34bd1a8fa9b1cae4aa2a61379265d90d5ca Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 18:35:43 +0000
Subject: [PATCH 263/269] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 composer.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.spec b/composer.spec
index 622d561..e0c9881 100644
--- a/composer.spec
+++ b/composer.spec
@@ -27,7 +27,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -205,6 +205,9 @@ php -r '
 
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Fri Jul 11 2025 Remi Collet <remi@remirepo.net> - 2.8.10-1
 - update to 2.8.10
 

From 34d2866a0e75784380120fe914ce84881c91ecac Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 28 Aug 2025 09:37:54 +0200
Subject: [PATCH 264/269] v2.8.11

---
 composer-bash-completion |  2 +-
 composer-rpm.patch       |  2 +-
 composer.spec            | 11 +++++++----
 sources                  |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index a14f0a3..81e4525 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.10")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.11")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer-rpm.patch b/composer-rpm.patch
index fdc97ac..7323225 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -39,7 +39,7 @@ diff -up ./vendor/composer/ca-bundle/src/CaBundle.php.rpm ./vendor/composer/ca-b
      public static function getBundledCaBundlePath()
      {
 -        $caBundleFile = __DIR__.'/../res/cacert.pem';
-+        $caBundleFile = '/etc/pki/tls/certs/ca-bundle.crt'; // System CA, always
++        $caBundleFile = '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'; // System CA, always
  
          // cURL does not understand 'phar://' paths
          // see https://github.com/composer/ca-bundle/issues/10
diff --git a/composer.spec b/composer.spec
index e0c9881..1da5833 100644
--- a/composer.spec
+++ b/composer.spec
@@ -8,7 +8,7 @@
 #
 
 
-%global gh_commit    53834f587d7ab2527eb237459d7b94d1fb9d4c5a
+%global gh_commit    00e1a3396eea67033775c4a49c772376f45acd73
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.10
+%global upstream_version 2.8.11
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -27,7 +27,7 @@
 
 Name:           composer
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 # SPDX: composer and all dependencies are MIT
@@ -76,7 +76,7 @@ BuildRequires:  composer-generators
 Requires:       php(language)                           >= 7.2.5
 Requires:       php-cli
 # System certificates
-Requires:       ca-certificates
+Requires:       /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
 
 # From composer.json, suggest
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -205,6 +205,9 @@ php -r '
 
 
 %changelog
+* Wed Aug 27 2025 Remi Collet <remi@remirepo.net> - 2.8.11-1
+- update to 2.8.11
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
diff --git a/sources b/sources
index d1b23eb..b91ef32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.10-53834f5.tgz) = 34a7a8816b3f8a54a2cab804d3af612ada3291fe69abd948113151de578c3eb1c052b6552cc1d18ec7a9c88a2ed26f3c24af53d93c4111e09c8309b2cbeef3c8
+SHA512 (composer-2.8.11-00e1a33.tgz) = 401398f5fd9bdd8b3b75228781c503363e6988c6f7289d6e39fd91cb83e6527fd38aeea2ce3909fede3132ee22ff9c711d97d43c337aa1b0d7d6f0c7e98643cc

From fbfc4285f46d39295627a679e3f30cee0904ad56 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 19 Sep 2025 14:09:46 +0200
Subject: [PATCH 265/269] v2.8.12

(cherry picked from commit b02ea19394b55ae7f75ab9714c1df9de3a99e193)
---
 composer-bash-completion |  2 +-
 composer.spec            | 11 +++++++++--
 sources                  |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 81e4525..6e27771 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.11")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.12")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 1da5833..f50cfa4 100644
--- a/composer.spec
+++ b/composer.spec
@@ -8,7 +8,7 @@
 #
 
 
-%global gh_commit    00e1a3396eea67033775c4a49c772376f45acd73
+%global gh_commit    3e38919bc9a2c3c026f2151b5e56d04084ce8f0b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 %global api_version  2.6.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.11
+%global upstream_version 2.8.12
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -111,6 +111,10 @@ Requires:       php-zlib
 Provides:       php-composer(composer-plugin-api) = %{api_version}
 Provides:       php-composer(composer-runtime-api) = %{run_version}
 
+# PEAR is now deprecated
+# composer is designed to replace it
+Supplements:    php-pear
+
 
 %description
 Composer helps you declare, manage and install dependencies of PHP projects,
@@ -205,6 +209,9 @@ php -r '
 
 
 %changelog
+* Fri Sep 19 2025 Remi Collet <remi@remirepo.net> - 2.8.12-1
+- update to 2.8.12
+
 * Wed Aug 27 2025 Remi Collet <remi@remirepo.net> - 2.8.11-1
 - update to 2.8.11
 
diff --git a/sources b/sources
index b91ef32..726b6e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.11-00e1a33.tgz) = 401398f5fd9bdd8b3b75228781c503363e6988c6f7289d6e39fd91cb83e6527fd38aeea2ce3909fede3132ee22ff9c711d97d43c337aa1b0d7d6f0c7e98643cc
+SHA512 (composer-2.8.12-3e38919.tgz) = a059574c12c74002ca1bc330e19355a8deb3fc94253c158e47b899dbb9fddefc888fed043950e8afcce1c8e688fac7789ed81855a214931fc12557b98eafe3ae

From 2a4898a61e9c738d44fac9dc922c1a5e7698f596 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 13 Nov 2025 11:41:12 +0100
Subject: [PATCH 266/269] v2.9.0

---
 composer-bash-completion |  2 +-
 composer.spec            | 50 +++++++++++++++++++++++-----------------
 sources                  |  2 +-
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 6e27771..907f4b8 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.8.12")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.0")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index f50cfa4..c4825d6 100644
--- a/composer.spec
+++ b/composer.spec
@@ -8,15 +8,15 @@
 #
 
 
-%global gh_commit    3e38919bc9a2c3c026f2151b5e56d04084ce8f0b
+%global gh_commit    5b236f4fb611083885d18031a9e503e1cdb6a3f6
 %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.6.0
+%global api_version  2.9.0
 %global run_version  2.2.2
 
-%global upstream_version 2.8.12
+%global upstream_version 2.9.0
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -56,45 +56,50 @@ BuildRequires:  composer-generators
 
 # From composer.json, "require": {
 #        "php": "^7.2.5 || ^8.0",
-#        "composer/ca-bundle": "^1.0",
+#        "ext-json": "*",
+#        "composer/ca-bundle": "^1.5",
+#        "composer/class-map-generator": "^1.4.0",
 #        "composer/metadata-minifier": "^1.0",
-#        "composer/semver": "^3.0",
-#        "composer/spdx-licenses": "^1.2",
+#        "composer/semver": "^3.3",
+#        "composer/spdx-licenses": "^1.5.7",
 #        "composer/xdebug-handler": "^2.0.2 || ^3.0.3",
-#        "justinrainbow/json-schema": "^5.2.11",
-#        "psr/log": "^1.0 || ^2.0 || ^3.0"
-#        "seld/jsonlint": "~1.4",
+#        "justinrainbow/json-schema": "^6.5.1",
+#        "psr/log": "^1.0 || ^2.0 || ^3.0",
+#        "seld/jsonlint": "^1.4",
 #        "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/console": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0",
+#        "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.1.10 || ^8.0",
+#        "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.1.10 || ^8.0",
+#        "symfony/process": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0",
+#        "react/promise": "^3.3",
+#        "composer/pcre": "^2.3 || ^3.3",
 #        "symfony/polyfill-php73": "^1.24",
-#        "symfony/polyfill-php80": "^1.24"
+#        "symfony/polyfill-php80": "^1.24",
+#        "symfony/polyfill-php81": "^1.24",
+#        "seld/signal-handler": "^2.0"
 Requires:       php(language)                           >= 7.2.5
+Requires:       php-json
 Requires:       php-cli
 # System certificates
 Requires:       /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
 
 # From composer.json, suggest
-#        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
-#        "ext-zip": "Enabling the zip extension allows you to unzip archives",
-#        "ext-zlib": "Allow gzip compression of HTTP requests"
+#        "ext-curl": "Provides HTTP support (will fallback to PHP streams if missing)",
+#        "ext-openssl": "Enables access to repositories and packages over HTTPS",
+#        "ext-zip": "Allows direct extraction of ZIP archives (unzip/7z binaries will be used instead if available)",
+#        "ext-zlib": "Enables gzip for HTTP requests"
+Requires:       php-curl
 Requires:       php-openssl
 Requires:       php-zip
 Requires:       php-zlib
 # From phpcompatinfo for version 2.2.5
 Requires:       php-ctype
-Requires:       php-curl
 Requires:       php-date
 Requires:       php-dom
 Requires:       php-filter
 Requires:       php-hash
 Requires:       php-iconv
 Requires:       php-intl
-Requires:       php-json
 Requires:       php-libxml
 Requires:       php-mbstring
 Requires:       php-pcntl
@@ -209,6 +214,9 @@ php -r '
 
 
 %changelog
+* Thu Nov 13 2025 Remi Collet <remi@remirepo.net> - 2.9.0-1
+- update to 2.9.0
+
 * Fri Sep 19 2025 Remi Collet <remi@remirepo.net> - 2.8.12-1
 - update to 2.8.12
 
diff --git a/sources b/sources
index 726b6e3..4f59e05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.8.12-3e38919.tgz) = a059574c12c74002ca1bc330e19355a8deb3fc94253c158e47b899dbb9fddefc888fed043950e8afcce1c8e688fac7789ed81855a214931fc12557b98eafe3ae
+SHA512 (composer-2.9.0-5b236f4.tgz) = 75cd4847907372561a533c8be354c2bfe334939d2909c7ae586bb99a549e91dfbe9324c46515631bfa4c1729fafd77d56844db1e74390627f060f0738071889f

From 60a8676c9b5d352f636482155b15759ee826307b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 14 Nov 2025 08:15:32 +0100
Subject: [PATCH 267/269] v2.9.1

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 907f4b8..f5283f5 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.0")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.1")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index c4825d6..2183f7e 100644
--- a/composer.spec
+++ b/composer.spec
@@ -8,7 +8,7 @@
 #
 
 
-%global gh_commit    5b236f4fb611083885d18031a9e503e1cdb6a3f6
+%global gh_commit    35cb6d47d03b0cae52dc12d686f941365b20f08b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 %global api_version  2.9.0
 %global run_version  2.2.2
 
-%global upstream_version 2.9.0
+%global upstream_version 2.9.1
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -214,6 +214,9 @@ php -r '
 
 
 %changelog
+* Thu Nov 13 2025 Remi Collet <remi@remirepo.net> - 2.9.1-1
+- update to 2.9.1
+
 * Thu Nov 13 2025 Remi Collet <remi@remirepo.net> - 2.9.0-1
 - update to 2.9.0
 
diff --git a/sources b/sources
index 4f59e05..ccf80dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.9.0-5b236f4.tgz) = 75cd4847907372561a533c8be354c2bfe334939d2909c7ae586bb99a549e91dfbe9324c46515631bfa4c1729fafd77d56844db1e74390627f060f0738071889f
+SHA512 (composer-2.9.1-35cb6d4.tgz) = f61bd99ea61a7748ba6b5607b88c734006d2be906552e0e94c74c74071b3f5078cc2e8cf619e227d90c1dd3a9ee2e89ba525024239fa160a6cdbbc4494441b36

From 3c30fb4380ef3c52c595a2c1bd8940f3783c9e98 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 20 Nov 2025 02:15:49 +0100
Subject: [PATCH 268/269] v2.9.2

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index f5283f5..4fd810b 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.1")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.2")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index 2183f7e..a1c9c09 100644
--- a/composer.spec
+++ b/composer.spec
@@ -8,7 +8,7 @@
 #
 
 
-%global gh_commit    35cb6d47d03b0cae52dc12d686f941365b20f08b
+%global gh_commit    8d5358f147c63a3a681b002076deff8c90e0b19d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 %global api_version  2.9.0
 %global run_version  2.2.2
 
-%global upstream_version 2.9.1
+%global upstream_version 2.9.2
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -214,6 +214,9 @@ php -r '
 
 
 %changelog
+* Thu Nov 20 2025 Remi Collet <remi@remirepo.net> - 2.9.2-1
+- update to 2.9.2
+
 * Thu Nov 13 2025 Remi Collet <remi@remirepo.net> - 2.9.1-1
 - update to 2.9.1
 
diff --git a/sources b/sources
index ccf80dc..b2b73d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.9.1-35cb6d4.tgz) = f61bd99ea61a7748ba6b5607b88c734006d2be906552e0e94c74c74071b3f5078cc2e8cf619e227d90c1dd3a9ee2e89ba525024239fa160a6cdbbc4494441b36
+SHA512 (composer-2.9.2-8d5358f.tgz) = 22b61191ebef87c12ab9791e94055a522ea31e0bc4723db1572ea07b3ab30b90f17786511f8a798df07ff4b0719b1a1409cb2ce8da76a14b77bf65c84273f93d

From 37be2c86fa224089736cb0de23b30bc85df20471 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 5 Jan 2026 10:16:59 +0100
Subject: [PATCH 269/269] v2.9.3

---
 composer-bash-completion | 2 +-
 composer.spec            | 7 +++++--
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/composer-bash-completion b/composer-bash-completion
index 4fd810b..0b6447f 100644
--- a/composer-bash-completion
+++ b/composer-bash-completion
@@ -25,7 +25,7 @@ _sf_composer() {
     local cur prev words cword
     _get_comp_words_by_ref -n := cur prev words cword
 
-    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.2")
+    local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.3")
     for w in ${words[@]}; do
         w=$(printf -- '%b' "$w")
         # remove quotes from typed values
diff --git a/composer.spec b/composer.spec
index a1c9c09..f6de2ad 100644
--- a/composer.spec
+++ b/composer.spec
@@ -8,7 +8,7 @@
 #
 
 
-%global gh_commit    8d5358f147c63a3a681b002076deff8c90e0b19d
+%global gh_commit    fb3bee27676fd852a8a11ebbb1de19b4dada5aba
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    2.0-dev
 %global gh_owner     composer
@@ -16,7 +16,7 @@
 %global api_version  2.9.0
 %global run_version  2.2.2
 
-%global upstream_version 2.9.2
+%global upstream_version 2.9.3
 #global upstream_prever  RC1
 #global upstream_lower   rc1
 
@@ -214,6 +214,9 @@ php -r '
 
 
 %changelog
+* Wed Dec 31 2025 Remi Collet <remi@remirepo.net> - 2.9.3-1
+- update to 2.9.3
+
 * Thu Nov 20 2025 Remi Collet <remi@remirepo.net> - 2.9.2-1
 - update to 2.9.2
 
diff --git a/sources b/sources
index b2b73d5..05fc8e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composer-2.9.2-8d5358f.tgz) = 22b61191ebef87c12ab9791e94055a522ea31e0bc4723db1572ea07b3ab30b90f17786511f8a798df07ff4b0719b1a1409cb2ce8da76a14b77bf65c84273f93d
+SHA512 (composer-2.9.3-fb3bee2.tgz) = b8f9a7bc73a7b765f113a22308e2b4b35c14ebfadadc57047a37f210be4099a49abc72c85c5c9ce200baa3e63ad0c1a97da744277ca1da948b419af40379658c