From 2b0cf67b934f5a3961b52a82aa478c8dce7fa812 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Nov 2019 11:20:04 +0100 Subject: [PATCH 01/18] v1.9.1 (cherry picked from commit 2904e1b36f7785e2735c6db05409416e01ad26a9) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 6d677a1..9b261b9 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 314aa57fdcfc942065996f59fb73a8b3f74f3fa5 +%global gh_commit bb01f2180df87ce7992b8331a68904f80439dd2f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.9.0 +%global upstream_version 1.9.1 #global upstream_prever RC %if 0 @@ -279,6 +279,9 @@ exit $ret %changelog +* Sat Nov 2 2019 Remi Collet - 1.9.1-1 +- update to 1.9.1 + * Sat Aug 3 2019 Remi Collet - 1.9.0-1 - update to 1.9.0 diff --git a/sources b/sources index 04152ee..5d914d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.9.0-314aa57.tgz) = 5bd2f3e9685a103f830ce0fb3818b0ca2c6c8456e15ebd6683c3c04e7b5a8ba41466c6a639233e549dc9198bb45bb4f2079773409505140bf15d99635141b099 +SHA512 (composer-1.9.1-bb01f21.tgz) = aaec165a30a8ff93fd81b9a4dd8318d077166dba55dab9753203f72689dbc38e0f7aa966d1d190a3faf92d41417a2e402ea2cb664a463cd6c48708e0aa3d34d2 From 93b929128be1943e41fa973cfbfb1ff93ee676f4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Jan 2020 08:00:39 +0100 Subject: [PATCH 02/18] v1.9.2 (cherry picked from commit d9070150c6361815de245cae2b9651a585a98bf7) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index 9b261b9..38f5724 100644 --- a/composer.spec +++ b/composer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2019 Remi Collet +# Copyright (c) 2015-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit bb01f2180df87ce7992b8331a68904f80439dd2f +%global gh_commit 7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.9.1 +%global upstream_version 1.9.2 #global upstream_prever RC %if 0 @@ -279,6 +279,9 @@ exit $ret %changelog +* Tue Jan 14 2020 Remi Collet - 1.9.2-1 +- update to 1.9.2 + * Sat Nov 2 2019 Remi Collet - 1.9.1-1 - update to 1.9.1 diff --git a/sources b/sources index 5d914d0..1d5d37e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.9.1-bb01f21.tgz) = aaec165a30a8ff93fd81b9a4dd8318d077166dba55dab9753203f72689dbc38e0f7aa966d1d190a3faf92d41417a2e402ea2cb664a463cd6c48708e0aa3d34d2 +SHA512 (composer-1.9.2-7a04aa0.tgz) = f121a9b89330f86c42a58ac557a93d3001f98af5c7b3a5b459dadb63a47602206c32662f5889f7f131fb71bd0da6d8ee143ffcea58541c67b078f4b0a2f69f27 From 7bc938fec1810dae76f8376f295efc24f67b2182 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Feb 2020 14:37:13 +0100 Subject: [PATCH 03/18] v1.9.3 (cherry picked from commit 2a788a0ea80275708ef469a1ced68b578b9a911f) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index 38f5724..e3d49e4 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 7a04aa0201ddaa0b3cf64d41022bd8cdcd7fafeb +%global gh_commit 1291a16ce3f48bfdeca39d64fca4875098af4d7b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.9.2 +%global upstream_version 1.9.3 #global upstream_prever RC %if 0 @@ -254,7 +254,7 @@ export BUILDROOT=%{buildroot} # testIntegration may hang on local build ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php72 php73 php74; do if which $cmd; then $cmd -d memory_limit=1G %{_bindir}/phpunit \ --filter '^((?!(testIntegration)).)*$' \ @@ -279,6 +279,9 @@ exit $ret %changelog +* Tue Feb 4 2020 Remi Collet - 1.9.3-1 +- update to 1.9.3 + * Tue Jan 14 2020 Remi Collet - 1.9.2-1 - update to 1.9.2 diff --git a/sources b/sources index 1d5d37e..b93fc6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.9.2-7a04aa0.tgz) = f121a9b89330f86c42a58ac557a93d3001f98af5c7b3a5b459dadb63a47602206c32662f5889f7f131fb71bd0da6d8ee143ffcea58541c67b078f4b0a2f69f27 +SHA512 (composer-1.9.3-1291a16.tgz) = e65305862550cea87d693edb0a16c7957a40cdcd466506b60a8faa21f689fdd3161509217cb1e71c77873b6af4bd6f8470ae805156689517885f9f4792ef9e6d From ce88b94d84031d0ea9ccbbb9ec9ff1b1ea57c0ae Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Mar 2020 09:09:51 +0100 Subject: [PATCH 04/18] v1.10.0 (cherry picked from commit afe24c28a5770c8d708105884e8b771acc0a5c48) --- composer-rpm.patch | 26 +++++++++++++------------- composer.spec | 21 ++++++++++++--------- sources | 2 +- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/composer-rpm.patch b/composer-rpm.patch index b6bccfb..ec7ff9b 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2019-08-03 10:30:10.000000000 +0200 -+++ ./bin/composer 2019-08-03 10:30:42.907772543 +0200 +--- ./bin/composer.rpm 2020-02-14 15:37:41.000000000 +0100 ++++ ./bin/composer 2020-02-14 15:37:43.336528140 +0100 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== ' } @@ -11,10 +11,10 @@ diff -up ./bin/composer.rpm ./bin/composer use Composer\Console\Application; use Composer\XdebugHandler\XdebugHandler; diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php ---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2019-08-03 10:30:10.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2019-08-03 10:30:42.908772550 +0200 -@@ -306,7 +306,7 @@ EOF; - file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion)); +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2020-02-14 15:37:43.336528140 +0100 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2020-02-14 15:38:56.710201606 +0100 +@@ -305,7 +305,7 @@ EOF; + $this->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion)); $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); - $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE'); @@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo if ($this->runScripts) { $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array( diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./src/Composer/Compiler.php.rpm 2019-08-03 10:30:10.000000000 +0200 -+++ ./src/Composer/Compiler.php 2019-08-03 10:30:42.908772550 +0200 +--- ./src/Composer/Compiler.php.rpm 2020-02-14 15:37:41.000000000 +0100 ++++ ./src/Composer/Compiler.php 2020-02-14 15:37:43.336528140 +0100 @@ -97,7 +97,7 @@ class Compiler $finder = new Finder(); $finder->files() @@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ->sort($finderSort) ; diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2019-08-03 10:30:42.908772550 +0200 -+++ ./src/Composer/Json/JsonFile.php 2019-08-03 10:32:48.919630077 +0200 +--- ./src/Composer/Json/JsonFile.php.rpm 2020-02-14 15:37:41.000000000 +0100 ++++ ./src/Composer/Json/JsonFile.php 2020-02-14 15:37:43.336528140 +0100 @@ -34,7 +34,7 @@ class JsonFile const JSON_PRETTY_PRINT = 128; const JSON_UNESCAPED_UNICODE = 256; @@ -46,7 +46,7 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php private $path; private $rfs; -@@ -160,7 +160,7 @@ class JsonFile +@@ -173,7 +173,7 @@ class JsonFile } if (null === $schemaFile) { @@ -56,8 +56,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php // Prepend with file:// only when not using a special schema already (e.g. in the phar) diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php ---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2019-08-03 10:30:10.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2019-08-03 10:30:42.908772550 +0200 +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2020-02-14 15:37:41.000000000 +0100 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2020-02-14 15:37:43.336528140 +0100 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { diff --git a/composer.spec b/composer.spec index e3d49e4..ecf4dec 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1291a16ce3f48bfdeca39d64fca4875098af4d7b +%global gh_commit 472c917b2a083ec7d2fa25c55fd099d1300e2515 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.9.3 +%global upstream_version 1.10.0 #global upstream_prever RC %if 0 @@ -81,9 +81,9 @@ BuildRequires: %{symfony_prefix}-filesystem BuildRequires: %{symfony_prefix}-process BuildRequires: php-zip # From composer.json, "require-dev": { -# "phpunit/phpunit": "^4.8.35 || ^5.7", -# "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" -BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35 +# "symfony/phpunit-bridge": "^3.4", +# "phpspec/prophecy": "^1.10" +BuildRequires: phpunit # For autoloader BuildRequires: php-composer(fedora/autoloader) >= 0.1.2 BuildRequires: php-seld-phar-utils >= 1.0.1 @@ -100,10 +100,10 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # "psr/log": "^1.0" # "seld/jsonlint": "~1.4", # "seld/phar-utils": "^1.0", -# "symfony/console": "^2.7 || ^3.0 || ^4.0", -# "symfony/filesystem": "^2.7 || ^3.0 || ^4.0", -# "symfony/finder": "^2.7 || ^3.0 || ^4.0", -# "symfony/process": "^2.7 || ^3.0 || ^4.0", +# "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0", +# "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0", +# "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0", +# "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0", Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-justinrainbow-json-schema5 @@ -279,6 +279,9 @@ exit $ret %changelog +* Wed Mar 11 2020 Remi Collet - 1.10.0-1 +- update to 1.10.0 + * Tue Feb 4 2020 Remi Collet - 1.9.3-1 - update to 1.9.3 diff --git a/sources b/sources index b93fc6f..78f485b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.9.3-1291a16.tgz) = e65305862550cea87d693edb0a16c7957a40cdcd466506b60a8faa21f689fdd3161509217cb1e71c77873b6af4bd6f8470ae805156689517885f9f4792ef9e6d +SHA512 (composer-1.10.0-472c917.tgz) = 69a1481c273e76034dd1ca09dc1c9ee7c48bf298c58c720360cc148255e2a2c840abf9e49d01747144645572c7348283046a9bea64a2f6a113c80429e00a1773 From dc9af3dba7013d06490c5f4eab9885caf7d25f41 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Mar 2020 08:43:44 +0100 Subject: [PATCH 05/18] v1.10.1 (cherry picked from commit a08145b039ce9da8edeb7bd3cd3c6ed121ef3612) --- composer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/composer.spec b/composer.spec index ecf4dec..be8bfbf 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 472c917b2a083ec7d2fa25c55fd099d1300e2515 +%global gh_commit b912a45da3e2b22f5cb5a23e441b697a295ba011 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.10.0 +%global upstream_version 1.10.1 #global upstream_prever RC %if 0 @@ -279,6 +279,9 @@ exit $ret %changelog +* Sat Mar 14 2020 Remi Collet - 1.10.1-1 +- update to 1.10.1 + * Wed Mar 11 2020 Remi Collet - 1.10.0-1 - update to 1.10.0 From 2a48ae8613bae518cefd6d6aca2b69c54a3b09c4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Mar 2020 08:48:37 +0100 Subject: [PATCH 06/18] v1.10.1 sources (cherry picked from commit 86179dd0aa64affb6d14aaf4c6e6571eb8266cfd) --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 78f485b..26856bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.0-472c917.tgz) = 69a1481c273e76034dd1ca09dc1c9ee7c48bf298c58c720360cc148255e2a2c840abf9e49d01747144645572c7348283046a9bea64a2f6a113c80429e00a1773 +SHA512 (composer-1.10.1-b912a45.tgz) = 1c596f6bc2b1e7456f0049221c05718e2f64372aa400e86c943cd5c3237a1b5a07294aa66cef54cecc2b0c5052ec17d24e6e55c468c7a8523650a754d7c7bbcb From adf4c1c4705ebfa748b07a63fd60f1544291c410 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Apr 2020 07:52:54 +0200 Subject: [PATCH 07/18] v1.10.4 (cherry picked from commit 081a1a17c5dec568f217a143190657218b014f89) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index be8bfbf..89684eb 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b912a45da3e2b22f5cb5a23e441b697a295ba011 +%global gh_commit 1efa6850b4a1740980346ac3582edf7dfb7899ee %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.10.1 +%global upstream_version 1.10.4 #global upstream_prever RC %if 0 @@ -279,6 +279,9 @@ exit $ret %changelog +* Thu Apr 9 2020 Remi Collet - 1.10.4-1 +- update to 1.10.4 + * Sat Mar 14 2020 Remi Collet - 1.10.1-1 - update to 1.10.1 diff --git a/sources b/sources index 26856bd..6de493b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.1-b912a45.tgz) = 1c596f6bc2b1e7456f0049221c05718e2f64372aa400e86c943cd5c3237a1b5a07294aa66cef54cecc2b0c5052ec17d24e6e55c468c7a8523650a754d7c7bbcb +SHA512 (composer-1.10.4-1efa685.tgz) = 3ef4e7d3d314ed276fd4e519294fbf5a3216f6b417f495b17fa665cc860c3fdd4ac782be876def0df5b07d0937feae8d1e3ec60ac604c5a4b1e0b45abd26ea18 From d68a93b4bcd5a46568f07302db56395ddc178952 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Apr 2020 12:24:30 +0200 Subject: [PATCH 08/18] v1.10.5 (cherry picked from commit e2b6bf12334a8cef046fbc35ed927fcdd622b3da) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 89684eb..7f0703a 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1efa6850b4a1740980346ac3582edf7dfb7899ee +%global gh_commit 7a4d5b6aa30d2118af27c04f5e897b57156ccfa9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -18,7 +18,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.10.4 +%global upstream_version 1.10.5 #global upstream_prever RC %if 0 @@ -279,6 +279,9 @@ exit $ret %changelog +* Fri Apr 10 2020 Remi Collet - 1.10.5-1 +- update to 1.10.5 + * Thu Apr 9 2020 Remi Collet - 1.10.4-1 - update to 1.10.4 diff --git a/sources b/sources index 6de493b..18f1c69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.4-1efa685.tgz) = 3ef4e7d3d314ed276fd4e519294fbf5a3216f6b417f495b17fa665cc860c3fdd4ac782be876def0df5b07d0937feae8d1e3ec60ac604c5a4b1e0b45abd26ea18 +SHA512 (composer-1.10.5-7a4d5b6.tgz) = 347e1063a864534434d2c61a7ebc75badd5b3e42b729866ce1a3fb1842055814994006cb65ad1cf13af3885e297ec05a990ba72439790189b634abcfbf6aa70a From 19e9b3a211fabcd7b8978b3396fbfd2e5b8ed431 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 May 2020 11:11:43 +0200 Subject: [PATCH 09/18] update to 1.10.6 provide php-composer(composer-runtime-api) (cherry picked from commit 962f6927f564abbddeb41122ce5c9d349b6f8bb5) --- composer.spec | 22 ++++++++++++++++------ sources | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/composer.spec b/composer.spec index 7f0703a..ad4254d 100644 --- a/composer.spec +++ b/composer.spec @@ -10,15 +10,16 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 7a4d5b6aa30d2118af27c04f5e897b57156ccfa9 +%global gh_commit be81b9c4735362c26876bdbfd3b5bc7e7f711c88 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer %global gh_project composer %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 +%global run_version 1.0.0 -%global upstream_version 1.10.5 +%global upstream_version 1.10.6 #global upstream_prever RC %if 0 @@ -170,6 +171,7 @@ Requires: php-zlib Provides: php-composer(composer/composer) = %{version} # Special internal for Plugin API Provides: php-composer(composer-plugin-api) = %{api_version} +Provides: php-composer(composer-runtime-api) = %{run_version} %description @@ -209,10 +211,14 @@ sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \ : check Plugin API version php -r ' -namespace Composer\Plugin; -include "src/Composer/Plugin/PluginInterface.php"; -if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) { - printf("Plugin API version is %s, expected %s\n", PluginInterface::PLUGIN_API_VERSION, "%{api_version}"); +namespace Composer; +include "src/Composer/autoload.php"; +if (version_compare(Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) { + printf("Plugin API version is %s, expected %s\n", Plugin\PluginInterface::PLUGIN_API_VERSION, "%{api_version}"); + exit(1); +} +if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) { + printf("Plugin API version is %s, expected %s\n", Composer::RUNTIME_API_VERSION, "%{run_version}"); exit(1); }' @@ -279,6 +285,10 @@ exit $ret %changelog +* Wed May 6 2020 Remi Collet - 1.10.6-1 +- update to 1.10.6 +- provide php-composer(composer-runtime-api) + * Fri Apr 10 2020 Remi Collet - 1.10.5-1 - update to 1.10.5 diff --git a/sources b/sources index 18f1c69..6c5dbe9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.5-7a4d5b6.tgz) = 347e1063a864534434d2c61a7ebc75badd5b3e42b729866ce1a3fb1842055814994006cb65ad1cf13af3885e297ec05a990ba72439790189b634abcfbf6aa70a +SHA512 (composer-1.10.6-be81b9c.tgz) = 447fe60a061eea920f32d5a94318bcea8351b1d5a2ce5e4683eaaa2d91215d7a5f920c765cb78ca2cc2afd74f748d4f2acaa2579b302e1c50e10033ea1e01600 From a5e09e7354f4393b2eef6660d98b54b9d0b831e1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Jun 2020 11:52:12 +0200 Subject: [PATCH 10/18] update to 1.10.7 raise dependency on justinrainbow/json-schema 5.2.10 (cherry picked from commit ffd5f6b34d5916c92577e121e63c9eddc67734d7) --- composer.spec | 86 +++++++++++++++++++++++---------------------------- sources | 2 +- 2 files changed, 40 insertions(+), 48 deletions(-) diff --git a/composer.spec b/composer.spec index ad4254d..e492c25 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit be81b9c4735362c26876bdbfd3b5bc7e7f711c88 +%global gh_commit 956608ea4f7de9e58c53dfb019d85ae62b193c39 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 1.1.0 %global run_version 1.0.0 -%global upstream_version 1.10.6 +%global upstream_version 1.10.7 #global upstream_prever RC %if 0 @@ -51,30 +51,24 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php-cli %if %{with_tests} -BuildRequires: php-justinrainbow-json-schema5 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) -BuildRequires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) -BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -BuildRequires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2) -BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) -BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) +BuildRequires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) +BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) +BuildRequires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2) +BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) +BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) +BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-composer(justinrainbow/json-schema) < 6) %else -BuildRequires: php-composer(composer/ca-bundle) < 2 -BuildRequires: php-composer(composer/ca-bundle) >= 1.0 -BuildRequires: php-composer(composer/semver) < 2 -BuildRequires: php-composer(composer/semver) >= 1.0 -BuildRequires: php-composer(composer/spdx-licenses) < 2 -BuildRequires: php-composer(composer/spdx-licenses) >= 1.2 -BuildRequires: php-composer(composer/xdebug-handler) >= 1.1 -BuildRequires: php-composer(composer/xdebug-handler) < 2 -BuildRequires: php-composer(seld/jsonlint) < 2 -BuildRequires: php-composer(seld/jsonlint) >= 1.4 -BuildRequires: php-composer(seld/phar-utils) < 2 -BuildRequires: php-composer(seld/phar-utils) >= 1.0 -BuildRequires: php-composer(psr/log) < 2 -BuildRequires: php-composer(psr/log) >= 1.0 +BuildRequires: php-composer-ca-bundle +BuildRequires: php-composer-semver +BuildRequires: php-composer-spdx-licenses >= 1.2 +BuildRequires: php-composer-xdebug-handler >= 1.1 +BuildRequires: php-jsonlint >= 1.4 +BuildRequires: php-seld-phar-utils +BuildRequires: php-PsrLog +BuildRequires: php-justinrainbow-json-schema5 >= 5.2.10 %endif BuildRequires: %{symfony_prefix}-console BuildRequires: %{symfony_prefix}-finder @@ -97,7 +91,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # "composer/semver": "^1.0", # "composer/spdx-licenses": "^1.2", # "composer/xdebug-handler": "^1.1", -# "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", +# "justinrainbow/json-schema": "^5.2.10", # "psr/log": "^1.0" # "seld/jsonlint": "~1.4", # "seld/phar-utils": "^1.0", @@ -107,30 +101,24 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0", Requires: php(language) >= 5.3.2 Requires: php-cli -Requires: php-justinrainbow-json-schema5 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) -Requires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) -Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -Requires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2) -Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) -Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) +Requires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) +Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) +Requires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2) +Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) +Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) +Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +Requires: (php-composer(justinrainbow/json-schema) >= 5.2.10 with php-composer(justinrainbow/json-schema) < 6) %else -Requires: php-composer(composer/ca-bundle) >= 1.0 -Requires: php-composer(composer/ca-bundle) < 2 -Requires: php-composer(composer/semver) >= 1.0 -Requires: php-composer(composer/semver) < 2 -Requires: php-composer(composer/spdx-licenses) >= 1.2 -Requires: php-composer(composer/spdx-licenses) < 2 -Requires: php-composer(composer/xdebug-handler) >= 1.1 -Requires: php-composer(composer/xdebug-handler) < 2 -Requires: php-composer(seld/jsonlint) >= 1.4 -Requires: php-composer(seld/jsonlint) < 2 -Requires: php-composer(seld/phar-utils) >= 1.0 -Requires: php-composer(seld/phar-utils) < 2 -Requires: php-composer(psr/log) >= 1.0 -Requires: php-composer(psr/log) < 2 +Requires: php-composer-ca-bundle +Requires: php-composer-semver +Requires: php-composer-spdx-licenses >= 1.2 +Requires: php-composer-xdebug-handler >= 1.1 +Requires: php-jsonlint >= 1.4 +Requires: php-seld-phar-utils +Requires: php-PsrLog +Requires: php-justinrainbow-json-schema5 >= 5.2.10 %endif Requires: %{symfony_prefix}-console Requires: %{symfony_prefix}-finder @@ -285,6 +273,10 @@ exit $ret %changelog +* Wed Jun 3 2020 Remi Collet - 1.10.7-1 +- update to 1.10.7 +- raise dependency on justinrainbow/json-schema 5.2.10 + * Wed May 6 2020 Remi Collet - 1.10.6-1 - update to 1.10.6 - provide php-composer(composer-runtime-api) diff --git a/sources b/sources index 6c5dbe9..acb3442 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.6-be81b9c.tgz) = 447fe60a061eea920f32d5a94318bcea8351b1d5a2ce5e4683eaaa2d91215d7a5f920c765cb78ca2cc2afd74f748d4f2acaa2579b302e1c50e10033ea1e01600 +SHA512 (composer-1.10.7-956608e.tgz) = 4b246289f86f2855808e9c03c80cc0ecf9b26f5f09f91fa09baff51d7e7245fbda50b247275333b783d894b87976a514ebf1301108238780750537ba935b50e7 From b589f7afa4368006894e8ecbf96ecc3e6e186f45 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Jun 2020 07:17:15 +0200 Subject: [PATCH 11/18] v1.0.8 (cherry picked from commit d86d74457f2368f68226b8f272a531e2aed290db) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index e492c25..daadd6c 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 956608ea4f7de9e58c53dfb019d85ae62b193c39 +%global gh_commit 56e0e094478f30935e9128552188355fa9712291 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -19,7 +19,7 @@ %global api_version 1.1.0 %global run_version 1.0.0 -%global upstream_version 1.10.7 +%global upstream_version 1.10.8 #global upstream_prever RC %if 0 @@ -76,7 +76,7 @@ BuildRequires: %{symfony_prefix}-filesystem BuildRequires: %{symfony_prefix}-process BuildRequires: php-zip # From composer.json, "require-dev": { -# "symfony/phpunit-bridge": "^3.4", +# "symfony/phpunit-bridge": "^4.2", # "phpspec/prophecy": "^1.10" BuildRequires: phpunit # For autoloader @@ -273,6 +273,9 @@ exit $ret %changelog +* Thu Jun 25 2020 Remi Collet - 1.10.8-1 +- update to 1.10.8 + * Wed Jun 3 2020 Remi Collet - 1.10.7-1 - update to 1.10.7 - raise dependency on justinrainbow/json-schema 5.2.10 diff --git a/sources b/sources index acb3442..deec5a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.7-956608e.tgz) = 4b246289f86f2855808e9c03c80cc0ecf9b26f5f09f91fa09baff51d7e7245fbda50b247275333b783d894b87976a514ebf1301108238780750537ba935b50e7 +SHA512 (composer-1.10.8-56e0e09.tgz) = 750106b846755706294689414102dab60d6bc10b674f1d9551e6e592810e542e532e210f5f8d1dd2185d6c615da68ad62e28726a2ba2da95ffeac26a5a7d1038 From 64c8ac04da24adeca7efc283031324cdeb7c006a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Jul 2020 13:59:40 +0200 Subject: [PATCH 12/18] v1.10.9 (cherry picked from commit b73e196093d30be6e4c231fdfbca18e0ffa88ad3) --- composer.spec | 14 +++++++++----- sources | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/composer.spec b/composer.spec index daadd6c..a36bebd 100644 --- a/composer.spec +++ b/composer.spec @@ -10,16 +10,17 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 56e0e094478f30935e9128552188355fa9712291 +%bcond_without tests + +%global gh_commit 83c3250093d5491600a822e176b107a945baf95a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer %global gh_project composer -%global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 %global run_version 1.0.0 -%global upstream_version 1.10.8 +%global upstream_version 1.10.9 #global upstream_prever RC %if 0 @@ -50,7 +51,7 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php-cli -%if %{with_tests} +%if %{with tests} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) BuildRequires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) @@ -236,7 +237,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %check -%if %{with_tests} +%if %{with tests} : Online tests rm tests/Composer/Test/Util/RemoteFilesystemTest.php @@ -273,6 +274,9 @@ exit $ret %changelog +* Thu Jul 16 2020 Remi Collet - 1.10.9-1 +- update to 1.10.9 + * Thu Jun 25 2020 Remi Collet - 1.10.8-1 - update to 1.10.8 diff --git a/sources b/sources index deec5a6..e50b8a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.8-56e0e09.tgz) = 750106b846755706294689414102dab60d6bc10b674f1d9551e6e592810e542e532e210f5f8d1dd2185d6c615da68ad62e28726a2ba2da95ffeac26a5a7d1038 +SHA512 (composer-1.10.9-83c3250.tgz) = 12006270a3ec6955daba1f442fb9489bb7f0f4f3ca318267c2e4606712fe3cc00a43a6fa8a53a867a857fb073ecee3f9f2997407780cb8129b7a7b9fde19672c From cdb2e5ac366455344911971a39267274f3e879f2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Aug 2020 13:43:35 +0200 Subject: [PATCH 13/18] v1.10.10 (cherry picked from commit 56409bcb5688bfa50016d42f0633fc087ab6fbd4) (cherry picked from commit 8c6056c7ae1a55247fb03128809a27004ac5660a) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index a36bebd..8d46030 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 83c3250093d5491600a822e176b107a945baf95a +%global gh_commit 32966a3b1d48bc01472a8321fd6472b44fad033a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 1.1.0 %global run_version 1.0.0 -%global upstream_version 1.10.9 +%global upstream_version 1.10.10 #global upstream_prever RC %if 0 @@ -274,6 +274,9 @@ exit $ret %changelog +* Tue Aug 4 2020 Remi Collet - 1.10.10-1 +- update to 1.10.10 + * Thu Jul 16 2020 Remi Collet - 1.10.9-1 - update to 1.10.9 diff --git a/sources b/sources index e50b8a4..7d18c52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.9-83c3250.tgz) = 12006270a3ec6955daba1f442fb9489bb7f0f4f3ca318267c2e4606712fe3cc00a43a6fa8a53a867a857fb073ecee3f9f2997407780cb8129b7a7b9fde19672c +SHA512 (composer-1.10.10-32966a3.tgz) = 08a09b0e000b7af767e05f012fc3b69967dc6957a561e988afccb0cb5d4104dc15257e094f30ee5fe83bcb1be1aef343e0fc281deef89c35fb899793a4a2a680 From 89c8dc22a09f498643abefd87e0a9da6c8e51ff1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Sep 2020 07:47:25 +0200 Subject: [PATCH 14/18] v1.10.12 (cherry picked from commit 75f7b83134110cd72ea68ab23ef5cfd43a2513b4) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 8d46030..5ddd8a1 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 32966a3b1d48bc01472a8321fd6472b44fad033a +%global gh_commit a6cc92b39c796ec3fb9a360f9c0e578afc2fc96d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 1.1.0 %global run_version 1.0.0 -%global upstream_version 1.10.10 +%global upstream_version 1.10.12 #global upstream_prever RC %if 0 @@ -274,6 +274,9 @@ exit $ret %changelog +* Wed Sep 9 2020 Remi Collet - 1.10.12-1 +- update to 1.10.12 + * Tue Aug 4 2020 Remi Collet - 1.10.10-1 - update to 1.10.10 diff --git a/sources b/sources index 7d18c52..7418b78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.10-32966a3.tgz) = 08a09b0e000b7af767e05f012fc3b69967dc6957a561e988afccb0cb5d4104dc15257e094f30ee5fe83bcb1be1aef343e0fc281deef89c35fb899793a4a2a680 +SHA512 (composer-1.10.12-a6cc92b.tgz) = ee52476a572cd725b0d9e5c0e58dc5c00392d775924d1d4ae2047e51a49e4960c65f45c362def13833af285686656c624b8faa1116aa54fb5ef155fa2325689a From 3d612422799cd57d86b270f094b40aad07694a7a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Sep 2020 14:13:22 +0200 Subject: [PATCH 15/18] v1.10.13 (cherry picked from commit f5bea90eaac884f5e4b1359ce1e95738a23cd7d0) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 5ddd8a1..a804f87 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit a6cc92b39c796ec3fb9a360f9c0e578afc2fc96d +%global gh_commit 47c841ba3b2d3fc0b4b13282cf029ea18b66d78b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 1.1.0 %global run_version 1.0.0 -%global upstream_version 1.10.12 +%global upstream_version 1.10.13 #global upstream_prever RC %if 0 @@ -274,6 +274,9 @@ exit $ret %changelog +* Wed Sep 9 2020 Remi Collet - 1.10.13-1 +- update to 1.10.13 + * Wed Sep 9 2020 Remi Collet - 1.10.12-1 - update to 1.10.12 diff --git a/sources b/sources index 7418b78..42fcdd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.12-a6cc92b.tgz) = ee52476a572cd725b0d9e5c0e58dc5c00392d775924d1d4ae2047e51a49e4960c65f45c362def13833af285686656c624b8faa1116aa54fb5ef155fa2325689a +SHA512 (composer-1.10.13-47c841b.tgz) = 39cc95dabcaadf8ad30e81ae2a936ae81d785ec263534858f10cd727edf5820f8ba944722347bf7a6fa487d1069f7e9f32eff331fd275ee596688c5122dd5761 From a8d51ee2ccc5bcefeaba4678b5c3d2f280dd224a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 13 Oct 2020 16:12:05 +0200 Subject: [PATCH 16/18] v1.10.15 (cherry picked from commit a71ecb8fc5f7e0f6e2c557a9735b2ee2079ae8e5) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index a804f87..90dfc64 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 47c841ba3b2d3fc0b4b13282cf029ea18b66d78b +%global gh_commit 547c9ee73fe26c77af09a0ea16419176b1cdbd12 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 1.1.0 %global run_version 1.0.0 -%global upstream_version 1.10.13 +%global upstream_version 1.10.15 #global upstream_prever RC %if 0 @@ -274,6 +274,9 @@ exit $ret %changelog +* Tue Oct 13 2020 Remi Collet - 1.10.15-1 +- update to 1.10.15 + * Wed Sep 9 2020 Remi Collet - 1.10.13-1 - update to 1.10.13 diff --git a/sources b/sources index 42fcdd7..503aa56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.13-47c841b.tgz) = 39cc95dabcaadf8ad30e81ae2a936ae81d785ec263534858f10cd727edf5820f8ba944722347bf7a6fa487d1069f7e9f32eff331fd275ee596688c5122dd5761 +SHA512 (composer-1.10.15-547c9ee.tgz) = 0e70f80775ec0136bacef5da353efbbc9786e4eb33b8e209c9b3350a3dbe8d65784ac3e920cc2b605f08e03d5dbe9c823505750ed9c04fcbfc85b438b800c66c From 0eff469cf93bd9925921865424661f3ef071fcdd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Oct 2020 10:38:32 +0100 Subject: [PATCH 17/18] v1.10.16 (cherry picked from commit 6bb52a76e00dda3328d377a455c1a4db493e2b63) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 90dfc64..0ce7c34 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 547c9ee73fe26c77af09a0ea16419176b1cdbd12 +%global gh_commit 217f0272673c72087862c40cf91ac07eb438d778 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 1.1.0 %global run_version 1.0.0 -%global upstream_version 1.10.15 +%global upstream_version 1.10.16 #global upstream_prever RC %if 0 @@ -274,6 +274,9 @@ exit $ret %changelog +* Sun Oct 25 2020 Remi Collet - 1.10.16-1 +- update to 1.10.16 + * Tue Oct 13 2020 Remi Collet - 1.10.15-1 - update to 1.10.15 diff --git a/sources b/sources index 503aa56..590f23b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.15-547c9ee.tgz) = 0e70f80775ec0136bacef5da353efbbc9786e4eb33b8e209c9b3350a3dbe8d65784ac3e920cc2b605f08e03d5dbe9c823505750ed9c04fcbfc85b438b800c66c +SHA512 (composer-1.10.16-217f027.tgz) = 2bb7818cb64863111982e6051701a5be74140590568a452330720783336bbd721318ea270c354a22a4c25b15a65e9c6f3a5c7ff1c89e272ed0cb33ec402ce85a From ebba18a46001b8d20ed4e5deaac712861676c51d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Nov 2020 07:46:46 +0100 Subject: [PATCH 18/18] v1.10.17 (cherry picked from commit ba1a04d525c90e94fc4800c399c66f5910dcd8c6) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 0ce7c34..b965098 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 217f0272673c72087862c40cf91ac07eb438d778 +%global gh_commit 09d42e18394d8594be24e37923031c4b7442a1cb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -20,7 +20,7 @@ %global api_version 1.1.0 %global run_version 1.0.0 -%global upstream_version 1.10.16 +%global upstream_version 1.10.17 #global upstream_prever RC %if 0 @@ -274,6 +274,9 @@ exit $ret %changelog +* Mon Nov 2 2020 Remi Collet - 1.10.17-1 +- update to 1.10.17 + * Sun Oct 25 2020 Remi Collet - 1.10.16-1 - update to 1.10.16 diff --git a/sources b/sources index 590f23b..14fffcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.16-217f027.tgz) = 2bb7818cb64863111982e6051701a5be74140590568a452330720783336bbd721318ea270c354a22a4c25b15a65e9c6f3a5c7ff1c89e272ed0cb33ec402ce85a +SHA512 (composer-1.10.17-09d42e1.tgz) = db18e5c4623ed6be0f35b2d4dddddec5df6c1414c6a98b45a5b65f4bbfc7b74feb05cc2f4ecfd14ca2c17cc4988f5696672ed434f7fb2e2607c9c047c27c49c0