From 5c17c7a2013acc3751fbe28d4ebe8a0f1555f6ba Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 21 Jan 2025 16:06:31 +0100
Subject: update to 2.8.5
---
composer-bash-completion | 2 +-
composer.spec | 43 +++++++++++++++++++++++--------------------
installed.json | 36 ++++++++++++++++++------------------
3 files changed, 42 insertions(+), 39 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 fecba28..27a6c5f 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
#
@@ -13,7 +13,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
@@ -21,7 +21,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
@@ -117,7 +117,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
@@ -127,24 +127,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
@@ -182,7 +182,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);
@@ -268,6 +268,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/installed.json b/installed.json
index 9469392..d50c5a2 100644
--- a/installed.json
+++ b/installed.json
@@ -2,17 +2,17 @@
"packages": [
{
"name": "composer/ca-bundle",
- "version": "1.5.4",
- "version_normalized": "1.5.4.0",
+ "version": "1.5.5",
+ "version_normalized": "1.5.5.0",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
- "reference": "bc0593537a463e55cadf45fd938d23b75095b7e1"
+ "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/ca-bundle/zipball/bc0593537a463e55cadf45fd938d23b75095b7e1",
- "reference": "bc0593537a463e55cadf45fd938d23b75095b7e1",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/08c50d5ec4c6ced7d0271d2862dec8c1033283e6",
+ "reference": "08c50d5ec4c6ced7d0271d2862dec8c1033283e6",
"shasum": ""
},
"require": {
@@ -26,7 +26,7 @@
"psr/log": "^1.0 || ^2.0 || ^3.0",
"symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0"
},
- "time": "2024-11-27T15:35:25+00:00",
+ "time": "2025-01-08T16:17:16+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -61,7 +61,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues",
- "source": "https://github.com/composer/ca-bundle/tree/1.5.4"
+ "source": "https://github.com/composer/ca-bundle/tree/1.5.5"
},
"funding": [
{
@@ -256,13 +256,13 @@
"time": "2024-11-12T16:24:47+00:00",
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "2.x-dev"
- },
"phpstan": {
"includes": [
"extension.neon"
]
+ },
+ "branch-alias": {
+ "dev-main": "2.x-dev"
}
},
"installation-source": "dist",
@@ -1098,12 +1098,12 @@
"time": "2024-09-25T14:11:13+00:00",
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "2.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"installation-source": "dist",
@@ -1948,12 +1948,12 @@
"time": "2024-09-25T14:11:13+00:00",
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "2.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"installation-source": "dist",
--
cgit