update to 2.10.0-RC1HEADmaster

5 files changed, 60 insertions, 57 deletions

diff --git a/composer-bash-completion b/composer-bash-completion
index 2bb50d1..66dcfb6 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-RC1")
     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..9fcb797 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  RC1
 
-%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,9 @@ php -r '
 
 
 %changelog
+* 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..6b63b6e 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.11",
+            "version_normalized": "1.5.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "961a5e4056dd2e4a2eedcac7576075947c28bf63"
+                "reference": "68ff39175e8e94a4bb1d259407ce51a6a60f09e6"
             },
             "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/68ff39175e8e94a4bb1d259407ce51a6a60f09e6",
+                "reference": "68ff39175e8e94a4bb1d259407ce51a6a60f09e6",
                 "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-03-30T09:16:10+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.11"
             },
             "funding": [
                 {
@@ -77,17 +77,17 @@
         },
         {
             "name": "composer/class-map-generator",
-            "version": "1.7.1",
-            "version_normalized": "1.7.1.0",
+            "version": "1.7.2",
+            "version_normalized": "1.7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1"
+                "reference": "6a9c2f0970022ab00dc58c07d0685dd712f2231b"
             },
             "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/6a9c2f0970022ab00dc58c07d0685dd712f2231b",
+                "reference": "6a9c2f0970022ab00dc58c07d0685dd712f2231b",
                 "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-03-30T15:36:56+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.2"
             },
             "funding": [
                 {
@@ -535,17 +535,17 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "6.6.4",
-            "version_normalized": "6.6.4.0",
+            "version": "v6.7.2",
+            "version_normalized": "6.7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jsonrainbow/json-schema.git",
-                "reference": "2eeb75d21cf73211335888e7f5e6fd7440723ec7"
+                "reference": "6fea66c7204683af437864e7c4e7abf383d14bc0"
             },
             "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/6fea66c7204683af437864e7c4e7abf383d14bc0",
+                "reference": "6fea66c7204683af437864e7c4e7abf383d14bc0",
                 "shasum": ""
             },
             "require": {
@@ -561,7 +561,7 @@
                 "phpstan/phpstan": "^1.12",
                 "phpunit/phpunit": "^8.5"
             },
-            "time": "2025-12-19T15:01:32+00:00",
+            "time": "2026-02-15T15:06:22+00:00",
             "bin": [
                 "bin/validate-json"
             ],
@@ -607,7 +607,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/v6.7.2"
             },
             "install-path": "../justinrainbow/json-schema"
         },
diff --git a/makesrc.sh b/makesrc.sh
index dc25efb..c7e8337 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -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."