This commit is contained in:
Remi Collet 2024-10-30 07:37:38 +01:00
commit d4fcde52da
3 changed files with 47 additions and 37 deletions

View file

@ -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

View file

@ -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

View file

@ -1 +1 @@
SHA512 (composer-2.8.1-e52b867.tgz) = 78f6f6406d7dac11cccc55458a3cd8ddd383e9b1e399562ff716c0e9cc75d76260a294fb032cf0d7f906c04746dd95c80f228abdf6eb9b20f3c2d7f9cd7988a2
SHA512 (composer-2.8.2-6e543d0.tgz) = 01da8edd05e0886bd289657722001d5aa3456ee2a56e4fd54a2a7e129d47d7b4543f272a984258df7599cc9da713f4d39c4fce64dc0b2de3c7a360fb6e294c49