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

(cherry picked from commit 885c8fe38431de72b46f3ace211c8e044bf7ab19)
---
 composer-bash-completion |  2 +-
 composer.spec            | 41 +++++++++++++++++++++-------------------
 sources                  |  2 +-
 3 files changed, 24 insertions(+), 21 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 520d77f..c213e3d 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
 
@@ -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
+
 * Tue Jun 11 2024 Remi Collet <remi@remirepo.net> - 2.7.7-1
 - update to 2.7.7
 
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 a9ad8a9bae8d8306982fcf0665a8c05f3ec4ed86 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 4 Sep 2024 15:36:03 +0200
Subject: [PATCH 02/13] v2.7.9

(cherry picked from commit f78e81fd0be49919f8ebe3d1018994679cb2bbd0)
---
 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 c213e3d..c481726 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 bf6151635e9a5f88081f7934f195b34ac0143716 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 3 Oct 2024 07:45:43 +0200
Subject: [PATCH 03/13] v2.8.0

(cherry picked from commit 9487f51293a9920cd2dc8f79d2f597732c07fe50)
---
 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 c481726..eb1f2b7 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 889cdfb7da14cc89e7ac4b99ca07fbe387e2ba23 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 4 Oct 2024 14:43:22 +0200
Subject: [PATCH 04/13] v2.8.1

(cherry picked from commit 8e0c415524d256fd08703313087e8c92a46b4251)
---
 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 eb1f2b7..ba9c568 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 ccad773681f46392d8662be793b9854bdd617f7b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Oct 2024 07:37:38 +0100
Subject: [PATCH 05/13] v2.8.2

(cherry picked from commit d4fcde52daef0cc5558fd40e1bc8103c0e4e5faf)
---
 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 ba9c568..3804e9c 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 306036c7b2233eacb3e582cf79c51e1fafdd926d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Oct 2024 08:07:41 +0100
Subject: [PATCH 06/13] fix diagnose command

(cherry picked from commit 4f7bdd0f218897cfd2ebae87d70e66de8b8f8d16)
---
 composer.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/composer.spec b/composer.spec
index 3804e9c..5590239 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 49a15b84cd8bb1363e855d9e895345956bfbee95 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Oct 2024 10:25:09 +0100
Subject: [PATCH 07/13] keep upstream layout for simplicity

(cherry picked from commit c90124e643b7f928bf2c68144c93f0f39ad87790)
---
 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 5590239..e4fb139 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 fd91e411b3f7d436a0782101586ed98fe1d4a38a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 30 Oct 2024 10:39:11 +0100
Subject: [PATCH 08/13] refresh sources

(cherry picked from commit 8114a124b14b2ee2027a8e8ccd10b871f7e0322c)
---
 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 3386b910f756b41fc1b09fb851dc68c157c59307 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 18 Nov 2024 09:36:01 +0100
Subject: [PATCH 09/13] v2.8.3

(cherry picked from commit b626a00179f5007034c841596aa00582521d074d)
---
 composer.spec | 67 +++++++++++++++++++++++++++------------------------
 sources       |  2 +-
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/composer.spec b/composer.spec
index e4fb139..a3b47f0 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 296079df75cefa298b73aff82f934f76b6455bfa Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 11 Dec 2024 13:59:01 +0100
Subject: [PATCH 10/13] update to 2.8.4

re-license spec file to CECILL-2.1

(cherry picked from commit 1a4995644a7cc8a40def8cac91a009d6ee0487aa)
---
 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 a3b47f0..14bca37 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 0154191d35803b8483953b1eed29e2c3ed6e56c1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 21 Jan 2025 16:11:24 +0100
Subject: [PATCH 11/13] v2.8.5

(cherry picked from commit 37b5f986cca66b20aa3172845f7edca03e6c6c59)
(cherry picked from commit 188bd62ad82250fa4402680789ef697327530507)
---
 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 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 14bca37..8a21ad7 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
 
@@ -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
+
 * 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
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 9c23494ac683d49a232f32b0397f96ba0053e99c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 25 Feb 2025 15:38:39 +0100
Subject: [PATCH 12/13] v2.8.6

(cherry picked from commit ae6d3b3084d75ccf8d76a915634d82697836c5de)
---
 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 8a21ad7..15c5e32 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 58453a215fed498a7f67a2a610072a164fc7360d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Apr 2025 08:51:31 +0200
Subject: [PATCH 13/13] v2.8.8

(cherry picked from commit a6ca5074a589b67a228ec0e47afe562adaf8231c)
---
 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 15c5e32..39081f9 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