diff options
| -rw-r--r-- | composer-bash-completion | 2 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | composer.spec | 40 | ||||
| -rw-r--r-- | installed.json | 154 | ||||
| -rwxr-xr-x | makesrc.sh | 34 |
5 files changed, 117 insertions, 115 deletions
diff --git a/composer-bash-completion b/composer-bash-completion index 2bb50d1..fb827f5 100644 --- a/composer-bash-completion +++ b/composer-bash-completion @@ -25,7 +25,7 @@ _sf_composer() { local cur prev words cword _get_comp_words_by_ref -n := cur prev words cword - local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.9.5") + local completecmd=("$sf_cmd" "_complete" "--no-interaction" "-sbash" "-c$cword" "-S2.10.0-RC2") for w in ${words[@]}; do w=$(printf -- '%b' "$w") # remove quotes from typed values diff --git a/composer.json b/composer.json index 19d64b8..635fcca 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ }, "extra": { "branch-alias": { - "dev-main": "2.9-dev" + "dev-main": "2.10-dev" }, "phpstan": { "includes": [ diff --git a/composer.spec b/composer.spec index d7dfda7..d3ab6ad 100644 --- a/composer.spec +++ b/composer.spec @@ -11,32 +11,29 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 72a8f8e653710e18d83e5dd531eb5a71fc3223e6 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_branch 2.0-dev -%global gh_owner composer -%global gh_project composer -%global api_version 2.9.0 -%global run_version 2.2.2 +%global gh_tag %{upstream_version}%{?upstream_prever:-%{upstream_prever}} +%global gh_owner composer +%global gh_project composer +%global api_version 2.9.0 +%global run_version 2.2.2 -%global upstream_version 2.9.5 -#global upstream_prever RC1 -#global upstream_lower rc1 +%global upstream_version 2.10.0 +%global upstream_prever RC2 -%global _phpunit %{_bindir}/phpunit9 -%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) -%global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) +%global _phpunit %{_bindir}/phpunit9 +%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) +%global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) Name: composer -Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: Dependency Manager for PHP # SPDX: composer and all dependencies are MIT License: MIT URL: https://getcomposer.org/ -Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz +Source0: %{gh_project}-%{gh_tag}.tgz # Profile scripts Source1: %{name}-bash-completion Source3: %{name}.sh @@ -132,7 +129,7 @@ Documentation: https://getcomposer.org/doc/ %prep -%setup -q -n %{gh_project}-%{gh_commit} +%setup -q -n %{gh_project}-%{gh_tag} %patch -P0 -p1 -b .rpm %patch -P1 -p1 -b .noxdg @@ -183,11 +180,12 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} : Licenses ln -sf ../../%{name}/LICENSE LICENSE cd vendor -for lic in */*/LICENSE +for lic in */*/LICENSE* do dir=$(dirname $lic) + fic=$(basename $lic) own=$(dirname $dir) prj=$(basename $dir) - ln -sf ../../composer/vendor/$own/$prj/LICENSE ../$own-$prj-LICENSE + ln -sf ../../composer/vendor/$own/$prj/$fic ../$own-$prj-LICENSE done @@ -217,6 +215,12 @@ php -r ' %changelog +* Thu May 21 2026 Remi Collet <remi@remirepo.net> - 2.10.0~RC2-1 +- update to 2.10.0-RC2 + +* Thu Apr 2 2026 Remi Collet <remi@remirepo.net> - 2.10.0~RC1-1 +- update to 2.10.0-RC1 + * Thu Jan 29 2026 Remi Collet <remi@remirepo.net> - 2.9.5-1 - update to 2.9.5 diff --git a/installed.json b/installed.json index 2a57bea..e3b4acf 100644 --- a/installed.json +++ b/installed.json @@ -2,17 +2,17 @@ "packages": [ { "name": "composer/ca-bundle", - "version": "1.5.10", - "version_normalized": "1.5.10.0", + "version": "1.5.12", + "version_normalized": "1.5.12.0", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "961a5e4056dd2e4a2eedcac7576075947c28bf63" + "reference": "00a2f4201641d5c53f7fc0195e6c8d9fcc321a78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/961a5e4056dd2e4a2eedcac7576075947c28bf63", - "reference": "961a5e4056dd2e4a2eedcac7576075947c28bf63", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/00a2f4201641d5c53f7fc0195e6c8d9fcc321a78", + "reference": "00a2f4201641d5c53f7fc0195e6c8d9fcc321a78", "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": "2025-12-08T15:06:51+00:00", + "time": "2026-05-19T11:26:22+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.10" + "source": "https://github.com/composer/ca-bundle/tree/1.5.12" }, "funding": [ { @@ -77,17 +77,17 @@ }, { "name": "composer/class-map-generator", - "version": "1.7.1", - "version_normalized": "1.7.1.0", + "version": "1.7.3", + "version_normalized": "1.7.3.0", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1" + "reference": "86d8208fc3c649a3a999daf1a63c25201be2990f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8f5fa3cc214230e71f54924bd0197a3bcc705eb1", - "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/86d8208fc3c649a3a999daf1a63c25201be2990f", + "reference": "86d8208fc3c649a3a999daf1a63c25201be2990f", "shasum": "" }, "require": { @@ -103,7 +103,7 @@ "phpunit/phpunit": "^8", "symfony/filesystem": "^5.4 || ^6 || ^7 || ^8" }, - "time": "2025-12-29T13:15:25+00:00", + "time": "2026-05-05T09:17:07+00:00", "type": "library", "extra": { "branch-alias": { @@ -133,7 +133,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.7.1" + "source": "https://github.com/composer/class-map-generator/tree/1.7.3" }, "funding": [ { @@ -383,27 +383,27 @@ }, { "name": "composer/spdx-licenses", - "version": "1.5.9", - "version_normalized": "1.5.9.0", + "version": "1.6.0", + "version_normalized": "1.6.0.0", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "edf364cefe8c43501e21e88110aac10b284c3c9f" + "reference": "5ecd0cb4177696f9fd48f1605dda81db3dee7889" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/edf364cefe8c43501e21e88110aac10b284c3c9f", - "reference": "edf364cefe8c43501e21e88110aac10b284c3c9f", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/5ecd0cb4177696f9fd48f1605dda81db3dee7889", + "reference": "5ecd0cb4177696f9fd48f1605dda81db3dee7889", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.11", - "symfony/phpunit-bridge": "^3 || ^7" + "symfony/phpunit-bridge": "^6.4.25 || ^7.3.3 || ^8.0" }, - "time": "2025-05-12T21:07:07+00:00", + "time": "2026-04-08T20:18:39+00:00", "type": "library", "extra": { "branch-alias": { @@ -446,7 +446,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/spdx-licenses/issues", - "source": "https://github.com/composer/spdx-licenses/tree/1.5.9" + "source": "https://github.com/composer/spdx-licenses/tree/1.6.0" }, "funding": [ { @@ -456,10 +456,6 @@ { "url": "https://github.com/composer", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" } ], "install-path": "./spdx-licenses" @@ -535,17 +531,17 @@ }, { "name": "justinrainbow/json-schema", - "version": "6.6.4", - "version_normalized": "6.6.4.0", + "version": "6.8.2", + "version_normalized": "6.8.2.0", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "2eeb75d21cf73211335888e7f5e6fd7440723ec7" + "reference": "2c89ebb95ca9cedc9347f780333f7b25792dcb76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/2eeb75d21cf73211335888e7f5e6fd7440723ec7", - "reference": "2eeb75d21cf73211335888e7f5e6fd7440723ec7", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/2c89ebb95ca9cedc9347f780333f7b25792dcb76", + "reference": "2c89ebb95ca9cedc9347f780333f7b25792dcb76", "shasum": "" }, "require": { @@ -555,13 +551,13 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "3.3.0", - "json-schema/json-schema-test-suite": "^23.2", + "json-schema/json-schema-test-suite": "dev-main", "marc-mabe/php-enum-phpstan": "^2.0", "phpspec/prophecy": "^1.19", "phpstan/phpstan": "^1.12", "phpunit/phpunit": "^8.5" }, - "time": "2025-12-19T15:01:32+00:00", + "time": "2026-05-05T05:39:01+00:00", "bin": [ "bin/validate-json" ], @@ -607,7 +603,7 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/6.6.4" + "source": "https://github.com/jsonrainbow/json-schema/tree/6.8.2" }, "install-path": "../justinrainbow/json-schema" }, @@ -1359,17 +1355,17 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.33.0", - "version_normalized": "1.33.0.0", + "version": "v1.37.0", + "version_normalized": "1.37.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" + "reference": "141046a8f9477948ff284fa65be2095baafb94f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", - "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/141046a8f9477948ff284fa65be2095baafb94f2", + "reference": "141046a8f9477948ff284fa65be2095baafb94f2", "shasum": "" }, "require": { @@ -1381,7 +1377,7 @@ "suggest": { "ext-ctype": "For best performance" }, - "time": "2024-09-09T11:45:10+00:00", + "time": "2026-04-10T16:19:22+00:00", "type": "library", "extra": { "thanks": { @@ -1421,7 +1417,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.37.0" }, "funding": [ { @@ -1445,17 +1441,17 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.33.0", - "version_normalized": "1.33.0.0", + "version": "v1.37.0", + "version_normalized": "1.37.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70" + "reference": "4864388bfbd3001ce88e234fab652acd91fdc57e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70", - "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/4864388bfbd3001ce88e234fab652acd91fdc57e", + "reference": "4864388bfbd3001ce88e234fab652acd91fdc57e", "shasum": "" }, "require": { @@ -1464,7 +1460,7 @@ "suggest": { "ext-intl": "For best performance" }, - "time": "2025-06-27T09:58:17+00:00", + "time": "2026-04-26T13:13:48+00:00", "type": "library", "extra": { "thanks": { @@ -1506,7 +1502,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.37.0" }, "funding": [ { @@ -1530,8 +1526,8 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.33.0", - "version_normalized": "1.33.0.0", + "version": "v1.37.0", + "version_normalized": "1.37.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -1594,7 +1590,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.37.0" }, "funding": [ { @@ -1618,17 +1614,17 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.33.0", - "version_normalized": "1.33.0.0", + "version": "v1.37.0", + "version_normalized": "1.37.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" + "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", - "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6a21eb99c6973357967f6ce3708cd55a6bec6315", + "reference": "6a21eb99c6973357967f6ce3708cd55a6bec6315", "shasum": "" }, "require": { @@ -1641,7 +1637,7 @@ "suggest": { "ext-mbstring": "For best performance" }, - "time": "2024-12-23T08:48:59+00:00", + "time": "2026-04-10T17:25:58+00:00", "type": "library", "extra": { "thanks": { @@ -1682,7 +1678,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.37.0" }, "funding": [ { @@ -1706,8 +1702,8 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.33.0", - "version_normalized": "1.33.0.0", + "version": "v1.37.0", + "version_normalized": "1.37.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -1765,7 +1761,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.37.0" }, "funding": [ { @@ -1789,23 +1785,23 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.33.0", - "version_normalized": "1.33.0.0", + "version": "v1.37.0", + "version_normalized": "1.37.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608" + "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608", - "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dfb55726c3a76ea3b6459fcfda1ec2d80a682411", + "reference": "dfb55726c3a76ea3b6459fcfda1ec2d80a682411", "shasum": "" }, "require": { "php": ">=7.2" }, - "time": "2025-01-02T08:10:11+00:00", + "time": "2026-04-10T16:19:22+00:00", "type": "library", "extra": { "thanks": { @@ -1852,7 +1848,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.37.0" }, "funding": [ { @@ -1876,8 +1872,8 @@ }, { "name": "symfony/polyfill-php81", - "version": "v1.33.0", - "version_normalized": "1.33.0.0", + "version": "v1.37.0", + "version_normalized": "1.37.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", @@ -1935,7 +1931,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.37.0" }, "funding": [ { @@ -1959,23 +1955,23 @@ }, { "name": "symfony/polyfill-php84", - "version": "v1.33.0", - "version_normalized": "1.33.0.0", + "version": "v1.37.0", + "version_normalized": "1.37.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php84.git", - "reference": "d8ced4d875142b6a7426000426b8abc631d6b191" + "reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191", - "reference": "d8ced4d875142b6a7426000426b8abc631d6b191", + "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/88486db2c389b290bf87ff1de7ebc1e13e42bb06", + "reference": "88486db2c389b290bf87ff1de7ebc1e13e42bb06", "shasum": "" }, "require": { "php": ">=7.2" }, - "time": "2025-06-24T13:30:11+00:00", + "time": "2026-04-10T18:47:49+00:00", "type": "library", "extra": { "thanks": { @@ -2018,7 +2014,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0" + "source": "https://github.com/symfony/polyfill-php84/tree/v1.37.0" }, "funding": [ { @@ -1,37 +1,39 @@ #!/bin/bash -NAME=$(sed -n '/^Name:/{s/.* //;p}' *.spec) -OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) -PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +NAME=$(sed -n '/^Name:/{s/.* //;p}' *.spec) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) -PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} +PREVER=$(sed -n '/^%global upstream_prever/{s/.* //;p}' $NAME.spec) +if [ -z "$PREVER" ] +then TAG=$VERSION +else TAG=$VERSION-$PREVER +fi -if [ -f $NAME-$VERSION$PREVER-$SHORT.tgz -a "$1" != "-f" ]; then - echo skip $NAME-$VERSION$PREVER-$SHORT.tgz already here +if [ -f $NAME-$TAG.tgz -a "$1" != "-f" ]; then + echo skip $NAME-$TAG.tgz already here else - echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n" + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$TAG\n" echo "Cloning..." - git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + git clone https://github.com/$OWNER/$PROJECT.git --depth 1 --branch $TAG $PROJECT-$TAG - echo "Getting commit..." - pushd $PROJECT-$COMMIT - git checkout $COMMIT || exit 1 + echo "Getting TAG $TAG..." + pushd $PROJECT-$TAG cp composer.json ../composer.json composer config platform.php 7.2.5 rm composer.lock composer install --no-interaction --no-progress --no-dev --optimize-autoloader cp vendor/composer/installed.json ../ - # bash completion + + echo "Bash completion" bin/composer completion bash >../composer-bash-completion popd echo "Archiving..." - tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + tar czf $NAME-$TAG.tgz --exclude-vcs $PROJECT-$TAG echo "Cleaning..." - rm -rf $PROJECT-$COMMIT + rm -rf $PROJECT-$TAG fi echo "Done." |
