Compare commits
7 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
d7bb77cef6 | ||
|
|
630615efc3 | ||
|
|
64f7104e3a | ||
|
|
d9f3971fa8 | ||
|
|
60603df345 | ||
|
|
20ff913663 | ||
|
|
188bd62ad8 |
4 changed files with 32 additions and 67 deletions
|
|
@ -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.12")
|
||||
for w in ${words[@]}; do
|
||||
w=$(printf -- '%b' "$w")
|
||||
# remove quotes from typed values
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
#
|
||||
|
|
@ -8,9 +8,7 @@
|
|||
#
|
||||
|
||||
|
||||
%bcond_with generators
|
||||
|
||||
%global gh_commit 112e37d1dca22b3fdb81cf3524ab4994f47fdb8c
|
||||
%global gh_commit 3e38919bc9a2c3c026f2151b5e56d04084ce8f0b
|
||||
%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.4
|
||||
%global upstream_version 2.8.12
|
||||
#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",
|
||||
|
|
@ -80,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",
|
||||
|
|
@ -111,44 +107,14 @@ 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.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
|
||||
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.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
|
||||
# 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}
|
||||
|
||||
# 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,
|
||||
|
|
@ -166,28 +132,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"], $pkg["version"]);
|
||||
}
|
||||
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 +209,27 @@ 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (composer-2.8.4-112e37d.tgz) = 3c5331460a31d3e3c52f6248063bcca85e0d0aeb5c581f0892f1ed63fd4610553e52be5e3dd802c0bf594b59c4d02aa356c16c5df14067e51420deb0951c47a3
|
||||
SHA512 (composer-2.8.12-3e38919.tgz) = a059574c12c74002ca1bc330e19355a8deb3fc94253c158e47b899dbb9fddefc888fed043950e8afcce1c8e688fac7789ed81855a214931fc12557b98eafe3ae
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue