From 65fe2493c7ca7f8c90caac08e250f606d40e40e1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Aug 2019 15:14:57 +0200 Subject: [PATCH 1/9] v1.9.0 (cherry picked from commit 609e0792cab485f369f7c369147ee159e1efa8e6) --- composer-rpm.patch | 43 ++++++++++++++++++++++++++----------------- composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/composer-rpm.patch b/composer-rpm.patch index 3ed61f4..b6bccfb 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,7 +1,7 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2018-07-26 09:44:36.765795459 +0200 -+++ ./bin/composer 2018-07-26 09:45:14.199012215 +0200 -@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') { +--- ./bin/composer.rpm 2019-08-03 10:30:10.000000000 +0200 ++++ ./bin/composer 2019-08-03 10:30:42.907772543 +0200 +@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== ' } setlocale(LC_ALL, 'C'); @@ -11,9 +11,9 @@ 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 2018-07-26 09:36:57.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2018-07-26 09:44:36.765795459 +0200 -@@ -305,7 +305,7 @@ EOF; +--- ./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)); $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); @@ -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 2018-07-26 09:36:57.000000000 +0200 -+++ ./src/Composer/Compiler.php 2018-07-26 09:44:36.765795459 +0200 +--- ./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 @@ -97,7 +97,7 @@ class Compiler $finder = new Finder(); $finder->files() @@ -35,20 +35,29 @@ 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 2018-07-26 09:36:57.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2018-07-26 09:44:36.765795459 +0200 -@@ -156,7 +156,7 @@ class JsonFile - self::validateSyntax($content, $this->path); +--- ./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 +@@ -34,7 +34,7 @@ class JsonFile + const JSON_PRETTY_PRINT = 128; + const JSON_UNESCAPED_UNICODE = 256; + +- const COMPOSER_SCHEMA_PATH = '/../../../res/composer-schema.json'; ++ const COMPOSER_SCHEMA_PATH = '/usr/share/composer/res/composer-schema.json'; + + private $path; + private $rfs; +@@ -160,7 +160,7 @@ class JsonFile } -- $schemaFile = __DIR__ . '/../../../res/composer-schema.json'; -+ $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'; + if (null === $schemaFile) { +- $schemaFile = __DIR__ . self::COMPOSER_SCHEMA_PATH; ++ $schemaFile = (getenv('BUILDROOT')?:'') . self::COMPOSER_SCHEMA_PATH; + } // Prepend with file:// only when not using a special schema already (e.g. in the phar) - if (false === strpos($schemaFile, '://')) { diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php ---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2018-07-26 09:36:57.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2018-07-26 09:44:36.765795459 +0200 +--- ./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 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { diff --git a/composer.spec b/composer.spec index 03d5542..4bacae2 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 19b5f66a0e233eb944f134df34091fe1c5dfcc11 +%global gh_commit 314aa57fdcfc942065996f59fb73a8b3f74f3fa5 %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.8.6 +%global upstream_version 1.9.0 #global upstream_prever RC %if 0 @@ -279,6 +279,9 @@ exit $ret %changelog +* Sat Aug 3 2019 Remi Collet - 1.9.0-1 +- update to 1.9.0 + * Tue Jun 11 2019 Remi Collet - 1.8.6-1 - update to 1.8.6 diff --git a/sources b/sources index 82a26bc..04152ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.8.6-19b5f66.tgz) = 12158c392f8987567d2ed902d52671b37a910498918cf76db30e6eb1110cf6fa3eac27279d5054dbfc92d83fe4a36f69211331ad580e7c3156ded71d68429f7b +SHA512 (composer-1.9.0-314aa57.tgz) = 5bd2f3e9685a103f830ce0fb3818b0ca2c6c8456e15ebd6683c3c04e7b5a8ba41466c6a639233e549dc9198bb45bb4f2079773409505140bf15d99635141b099 From daad00d98c42bb7ea431ae30e28a6a0049f37181 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Nov 2019 11:20:04 +0100 Subject: [PATCH 2/9] v1.9.1 (cherry picked from commit 2904e1b36f7785e2735c6db05409416e01ad26a9) (cherry picked from commit 2b0cf67b934f5a3961b52a82aa478c8dce7fa812) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 4bacae2..6916148 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 50869b14c929d959309bd663a07c8b3bba5ef804 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Jan 2020 08:00:39 +0100 Subject: [PATCH 3/9] 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 6916148..7a48798 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 025f8737e9229b0d960f0af278f400aacd2699e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Feb 2020 14:37:13 +0100 Subject: [PATCH 4/9] v1.9.3 (cherry picked from commit 2a788a0ea80275708ef469a1ced68b578b9a911f) (cherry picked from commit 7bc938fec1810dae76f8376f295efc24f67b2182) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index 7a48798..427cb71 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 cc54d9356d70fd66ddb471f000a41fa3ce866cd6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Mar 2020 09:09:51 +0100 Subject: [PATCH 5/9] 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 427cb71..c6f00b7 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 64d6db274c735701ef39e95c7471ec7542dcbf41 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Mar 2020 08:43:44 +0100 Subject: [PATCH 6/9] v1.10.1 --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index c6f00b7..2102fa1 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 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 999de4af3c3443137bd4014a00598c6647d7254e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Apr 2020 07:52:54 +0200 Subject: [PATCH 7/9] 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 2102fa1..0a1125c 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 630ac18289690bd9e99752588c84268ad4797f49 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Apr 2020 12:24:30 +0200 Subject: [PATCH 8/9] 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 0a1125c..6993f6f 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 776ae22355458a50074298c797f1882eff9e35a9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 May 2020 11:11:43 +0200 Subject: [PATCH 9/9] 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 6993f6f..c423499 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