From 69d1246e672cacb04918a571e8a3750f26242b54 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Nov 2015 08:26:32 +0100 Subject: [PATCH 01/73] 20151030 (cherry picked from commit 9c70a39249a63a064e3c79004476d095d777b46b) --- .gitignore | 2 ++ composer-autoload.php | 6 ++--- composer.spec | 52 ++++++++++++++++++++++++++++--------------- sources | 2 +- 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 10b886e..25b6d6e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ clog /composer-1.0.0-c83650f.tar.gz /composer-1.0.0-9f6fdfd.tar.gz /composer-1.0.0-7a9eb02.tar.gz +/composer-1.0.0-a54f84f.tar.gz +/composer-1.0.0-5a5088e.tar.gz diff --git a/composer-autoload.php b/composer-autoload.php index d5a4646..71f153e 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -11,15 +11,15 @@ if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Compo } $fedoraClassLoader->addPrefixes(array( - 'Seld\\JsonLint\\' => $vendorDir, - 'Seld\\PharUtils\\' => $vendorDir, - 'Seld\\CliPrompt\\' => $vendorDir, 'Symfony\\Component\\' => $vendorDir, 'Composer\\' => dirname(__DIR__) )); $fedoraClassLoader->register(); // Dependencies +require_once $vendorDir . '/Seld/JsonLint/autoload.php'; +require_once $vendorDir . '/Seld/PharUtils/autoload.php'; +require_once $vendorDir . '/Seld/CliPrompt/autoload.php'; require_once $vendorDir . '/Composer/Spdx/autoload.php'; require_once $vendorDir . '/Composer/Semver/autoload.php'; require_once $vendorDir . '/JsonSchema/autoload.php'; diff --git a/composer.spec b/composer.spec index 0244820..8c2b419 100644 --- a/composer.spec +++ b/composer.spec @@ -6,10 +6,10 @@ # # Please, preserve the changelog entries # -%global gh_commit 7a9eb02190d334513e99a479510f87eed18cf958 +%global gh_commit 5a5088eb342e4876cb28472ba1fc3f1da7a14852 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev -%global gh_date 20151007 +%global gh_date 20151030 %global gh_owner composer %global gh_project composer %global with_tests %{?_without_tests:0}%{!?_without_tests:1} @@ -17,7 +17,7 @@ Name: composer Version: 1.0.0 -Release: 0.12.%{gh_date}git%{gh_short}%{?dist} +Release: 0.14.%{gh_date}git%{gh_short}%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -37,27 +37,36 @@ BuildRequires: php-composer(justinrainbow/json-schema) >= 1.4.4 BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 BuildRequires: php-composer(composer/semver) >= 1.0 BuildRequires: php-composer(seld/jsonlint) >= 1.0 +BuildRequires: php-composer(seld/phar-utils) >= 1.0 +BuildRequires: php-composer(seld/cli-prompt) >= 1.0 BuildRequires: php-composer(symfony/console) >= 2.5 BuildRequires: php-composer(symfony/finder) >= 2.2 BuildRequires: php-composer(symfony/filesystem) >= 2.5 BuildRequires: php-composer(symfony/process) >= 2.1 -BuildRequires: php-composer(symfony/class-loader) -BuildRequires: %{_bindir}/phpunit BuildRequires: php-zip +# From composer.json, "require-dev": { +# "phpunit/phpunit": "^4.5 || ^5.0.5", +# "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" +BuildRequires: php-composer(phpunit/phpunit) >= 4.5 +# For autoloader +BuildRequires: php-composer(symfony/class-loader) +BuildRequires: php-seld-phar-utils >= 1.0.1 +BuildRequires: php-seld-cli-prompt >= 1.0.0-3 +BuildRequires: php-jsonlint >= 1.3.1-3 %endif -# From composer.json, requires -# "php": ">=5.3.2", +# From composer.json, "require": { +# "php": "^5.3.2 || ^7.0", # "justinrainbow/json-schema": "^1.4.4", # "composer/spdx-licenses": "^1.0", # "composer/semver": "^1.0", # "seld/jsonlint": "~1.0", -# "symfony/console": "~2.5", -# "symfony/finder": "~2.2", -# "symfony/process": "~2.1", -# "symfony/filesystem": "~2.5", -# "seld/phar-utils": "~1.0", -# "seld/cli-prompt": "~1.0" +# "symfony/console": "^2.5 || ^3.0", +# "symfony/finder": "^2.2 || ^3.0", +# "symfony/process": "^2.1 || ^3.0", +# "symfony/filesystem": "^2.5 || ^3.0", +# "seld/phar-utils": "^1.0", +# "seld/cli-prompt": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-composer(justinrainbow/json-schema) >= 1.4.4 @@ -73,13 +82,13 @@ Requires: php-composer(seld/phar-utils) < 2 Requires: php-composer(seld/cli-prompt) >= 1.0 Requires: php-composer(seld/cli-prompt) < 2 Requires: php-composer(symfony/console) >= 2.5 -Requires: php-composer(symfony/console) < 3 +Requires: php-composer(symfony/console) < 4 Requires: php-composer(symfony/finder) >= 2.2 -Requires: php-composer(symfony/finder) < 3 +Requires: php-composer(symfony/finder) < 4 Requires: php-composer(symfony/process) >= 2.1 -Requires: php-composer(symfony/process) < 3 +Requires: php-composer(symfony/process) < 4 Requires: php-composer(symfony/filesystem) >= 2.5 -Requires: php-composer(symfony/filesystem) < 3 +Requires: php-composer(symfony/filesystem) < 4 # From composer.json, suggest # "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic", # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages" @@ -87,6 +96,9 @@ Requires: php-zip Requires: php-openssl # For our autoloader Requires: php-composer(symfony/class-loader) +Requires: php-seld-phar-utils >= 1.0.1 +Requires: php-seld-cli-prompt >= 1.0.0-3 +Requires: php-jsonlint >= 1.3.1-3 # From phpcompatinfo Requires: php-curl Requires: php-date @@ -188,6 +200,11 @@ export BUILDROOT=%{buildroot} %changelog +* Mon Nov 2 2015 Remi Collet - 1.0.0-0.14.20151030git5a5088e +- new snapshot +- allow symfony 3 +- use autoloader from all dependencies + * Sun Oct 11 2015 Remi Collet - 1.0.0-0.12.20151007git7a9eb02 - new snapshot - provide php-composer(composer-plugin-api) @@ -195,7 +212,6 @@ export BUILDROOT=%{buildroot} - add dependency on composer/semver - add dependency on symfony/filesystem - * Tue Sep 8 2015 Remi Collet - 1.0.0-0.9.20150907git9f6fdfd - new snapshot - add LICENSE in application data, as used by the code diff --git a/sources b/sources index 4a0463f..e1b4a49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5ae42eaebfcf4b405247d3ec77e46b3 composer-1.0.0-7a9eb02.tar.gz +f19601c7374366d9cf44bd31670483c2 composer-1.0.0-5a5088e.tar.gz From 9bfbabb2d08fef46431322ddc3c76855e2abe7f7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Nov 2015 14:01:46 +0100 Subject: [PATCH 02/73] version 1.0.0alpha11 (cherry picked from commit be209063f5ebcd4bfc7ff83f6d10ed8e2020f080) --- .gitignore | 1 + composer.spec | 17 +++++++++++++---- sources | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 25b6d6e..be4c97d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /composer-1.0.0-7a9eb02.tar.gz /composer-1.0.0-a54f84f.tar.gz /composer-1.0.0-5a5088e.tar.gz +/composer-1.0.0-cd9054c.tar.gz diff --git a/composer.spec b/composer.spec index 8c2b419..2bb1287 100644 --- a/composer.spec +++ b/composer.spec @@ -6,18 +6,19 @@ # # Please, preserve the changelog entries # -%global gh_commit 5a5088eb342e4876cb28472ba1fc3f1da7a14852 +%global gh_commit cd9054ce2abd1d06ed0eb1244eba1b2c2af633b6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_branch 1.0-dev -%global gh_date 20151030 +#global gh_branch 1.0-dev +#global gh_date 20151114 %global gh_owner composer %global gh_project composer %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.0.0 +%global prever alpha11 Name: composer Version: 1.0.0 -Release: 0.14.%{gh_date}git%{gh_short}%{?dist} +Release: 0.15.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -142,12 +143,17 @@ cp -p %{SOURCE2} tests/bootstrap.php rm src/bootstrap.php : fix reported version +%if 0%{?gh_date} DATE=%{gh_date} DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6:2} sed -e '/VERSION/s/@package_version@/%{gh_commit}/' \ -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@/%{gh_branch}/' \ -e "/RELEASE_DATE/s/@release_date@/$DATE/" \ -i src/Composer/Composer.php +%else +sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \ + -i src/Composer/Composer.php +%endif : check Plugin API version php -r ' @@ -200,6 +206,9 @@ export BUILDROOT=%{buildroot} %changelog +* Sat Nov 14 2015 Remi Collet - 1.0.0-0.15.alpha1 +- update to 1.0.0alpha11 + * Mon Nov 2 2015 Remi Collet - 1.0.0-0.14.20151030git5a5088e - new snapshot - allow symfony 3 diff --git a/sources b/sources index e1b4a49..476d3e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f19601c7374366d9cf44bd31670483c2 composer-1.0.0-5a5088e.tar.gz +89cc0fba32dcbb4e4012ad38148afb96 composer-1.0.0-cd9054c.tar.gz From e9a8672c71dd66d58251b31b74f13845aef9236f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Mar 2016 07:47:12 +0100 Subject: [PATCH 03/73] v1.0.0beta1 (cherry picked from commit 352b316f619ae1fc0ab9ace901a5212563a44b75) --- .gitignore | 3 +++ composer-autoload.php | 3 ++- composer-rpm.patch | 33 ++++++++++--------------------- composer.spec | 45 ++++++++++++++++++++++++++++--------------- sources | 2 +- 5 files changed, 45 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index be4c97d..0bf3827 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ clog /composer-1.0.0-a54f84f.tar.gz /composer-1.0.0-5a5088e.tar.gz /composer-1.0.0-cd9054c.tar.gz +/composer-1.0.0-64b0d72.tar.gz +/composer-1.0.0-4c0e163.tar.gz +/composer-1.0.0-5cb2b52.tar.gz diff --git a/composer-autoload.php b/composer-autoload.php index 71f153e..811b39c 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -1,4 +1,6 @@ addPrefixes(array( 'Symfony\\Component\\' => $vendorDir, 'Composer\\' => dirname(__DIR__) )); -$fedoraClassLoader->register(); // Dependencies require_once $vendorDir . '/Seld/JsonLint/autoload.php'; diff --git a/composer-rpm.patch b/composer-rpm.patch index 9ac2a38..108900f 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2015-09-20 20:44:55.000000000 +0200 -+++ ./bin/composer 2015-09-21 17:38:08.532640919 +0200 +--- ./bin/composer.rpm 2016-01-27 14:04:22.000000000 +0100 ++++ ./bin/composer 2016-01-27 16:32:11.313455545 +0100 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') { echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL; } @@ -11,21 +11,21 @@ diff -up ./bin/composer.rpm ./bin/composer use Composer\Console\Application; diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php ---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2015-09-21 17:38:08.532640919 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2015-09-21 17:38:58.418873383 +0200 -@@ -290,7 +290,7 @@ EOF; +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2016-01-27 14:04:22.000000000 +0100 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2016-01-27 16:32:11.313455545 +0100 +@@ -287,7 +287,7 @@ EOF; file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader)); $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); - $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE'); + $this->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE'); - $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array( - 'optimize' => (bool) $scanPsr0Packages, + if ($this->runScripts) { + $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array( diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2015-09-20 20:44:55.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2015-09-21 17:38:08.532640919 +0200 -@@ -149,7 +149,7 @@ class JsonFile +--- ./src/Composer/Json/JsonFile.php.rpm 2016-01-27 14:04:22.000000000 +0100 ++++ ./src/Composer/Json/JsonFile.php 2016-01-27 16:32:11.313455545 +0100 +@@ -155,7 +155,7 @@ class JsonFile self::validateSyntax($content, $this->path); } @@ -34,16 +34,3 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php $schemaData = json_decode(file_get_contents($schemaFile)); if ($schema === self::LAX_SCHEMA) { -diff -up ./src/Composer/Command/DiagnoseCommand.php.rpm ./src/Composer/Command/DiagnoseCommand.php ---- ./src/Composer/Command/DiagnoseCommand.php.rpm 2015-10-07 12:05:33.000000000 +0200 -+++ ./src/Composer/Command/DiagnoseCommand.php 2015-10-11 19:45:58.427641279 +0200 -@@ -132,9 +132,6 @@ - $io->write('Checking disk free space: ', false); - $this->outputResult($this->checkDiskSpace($config)); - -- $io->write('Checking composer version: ', false); -- $this->outputResult($this->checkVersion()); -- - return $this->failures; - } - diff --git a/composer.spec b/composer.spec index 2bb1287..1794e5a 100644 --- a/composer.spec +++ b/composer.spec @@ -1,24 +1,24 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015 Remi Collet +# Copyright (c) 2015-2016 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit cd9054ce2abd1d06ed0eb1244eba1b2c2af633b6 +%global gh_commit 5cb2b522637a941d608c58bd522f3b2a7bda4a1c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -#global gh_branch 1.0-dev -#global gh_date 20151114 +%global gh_branch 1.0-dev +#global gh_date 20160220 %global gh_owner composer %global gh_project composer %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.0.0 -%global prever alpha11 +%global prever beta1 Name: composer Version: 1.0.0 -Release: 0.15.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist} +Release: 0.21.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -34,10 +34,10 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php-cli %if %{with_tests} -BuildRequires: php-composer(justinrainbow/json-schema) >= 1.4.4 +BuildRequires: php-composer(justinrainbow/json-schema) >= 1.6 BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 BuildRequires: php-composer(composer/semver) >= 1.0 -BuildRequires: php-composer(seld/jsonlint) >= 1.0 +BuildRequires: php-composer(seld/jsonlint) >= 1.4 BuildRequires: php-composer(seld/phar-utils) >= 1.0 BuildRequires: php-composer(seld/cli-prompt) >= 1.0 BuildRequires: php-composer(symfony/console) >= 2.5 @@ -53,15 +53,14 @@ BuildRequires: php-composer(phpunit/phpunit) >= 4.5 BuildRequires: php-composer(symfony/class-loader) BuildRequires: php-seld-phar-utils >= 1.0.1 BuildRequires: php-seld-cli-prompt >= 1.0.0-3 -BuildRequires: php-jsonlint >= 1.3.1-3 %endif # From composer.json, "require": { # "php": "^5.3.2 || ^7.0", -# "justinrainbow/json-schema": "^1.4.4", +# "justinrainbow/json-schema": "^1.6", # "composer/spdx-licenses": "^1.0", # "composer/semver": "^1.0", -# "seld/jsonlint": "~1.0", +# "seld/jsonlint": "~1.4", # "symfony/console": "^2.5 || ^3.0", # "symfony/finder": "^2.2 || ^3.0", # "symfony/process": "^2.1 || ^3.0", @@ -70,13 +69,13 @@ BuildRequires: php-jsonlint >= 1.3.1-3 # "seld/cli-prompt": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli -Requires: php-composer(justinrainbow/json-schema) >= 1.4.4 +Requires: php-composer(justinrainbow/json-schema) >= 1.6 Requires: php-composer(justinrainbow/json-schema) < 2 Requires: php-composer(composer/spdx-licenses) >= 1.0 Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/semver) >= 1.0 Requires: php-composer(composer/semver) < 2 -Requires: php-composer(seld/jsonlint) >= 1.0 +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 @@ -99,7 +98,6 @@ Requires: php-openssl Requires: php-composer(symfony/class-loader) Requires: php-seld-phar-utils >= 1.0.1 Requires: php-seld-cli-prompt >= 1.0.0-3 -Requires: php-jsonlint >= 1.3.1-3 # From phpcompatinfo Requires: php-curl Requires: php-date @@ -136,7 +134,8 @@ Documentation: https://getcomposer.org/doc/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 +%patch0 -p1 -b .rpm +find . -name \*.rpm -exec rm {} \; -print cp -p %{SOURCE1} src/Composer/autoload.php cp -p %{SOURCE2} tests/bootstrap.php @@ -170,6 +169,7 @@ if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) { %install + : Library mkdir -p %{buildroot}%{_datadir}/php cp -pr src/* %{buildroot}%{_datadir}/php @@ -187,9 +187,17 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %check %if %{with_tests} +%if 0%{?rhel} == 5 +rm tests/Composer/Test/Downloader/XzDownloaderTest.php +%endif + : Run test suite export BUILDROOT=%{buildroot} %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose + +if which php70; then + php70 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose +fi %else : Test suite disabled %endif @@ -206,6 +214,11 @@ export BUILDROOT=%{buildroot} %changelog +* Fri Mar 4 2016 Remi Collet - 1.0.0-0.21.beta1 +- update to 1.0.0beta1 +- raise dependency on justinrainbow/json-schema ^1.6 +- raise dependency on seld/jsonlint ^1.4 + * Sat Nov 14 2015 Remi Collet - 1.0.0-0.15.alpha1 - update to 1.0.0alpha11 @@ -291,4 +304,4 @@ export BUILDROOT=%{buildroot} - new snapshot * Thu Feb 26 2015 Remi Collet - 1.0.0-0.1.20150225gite5985a9 -- Initial package \ No newline at end of file +- Initial package diff --git a/sources b/sources index 476d3e1..2b5005a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89cc0fba32dcbb4e4012ad38148afb96 composer-1.0.0-cd9054c.tar.gz +fbb93bb86f2b66b2032e494bd71594fc composer-1.0.0-5cb2b52.tar.gz From 6efef67c2cdc0c2094e9a82031f1dbbbf8749543 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 29 Mar 2016 06:11:29 +0200 Subject: [PATCH 04/73] v1.0.0-beta2 (cherry picked from commit 79b632e141042311ac4297bf4ed3f12c1de78734) --- .gitignore | 1 + composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0bf3827..bbbc4ff 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /composer-1.0.0-64b0d72.tar.gz /composer-1.0.0-4c0e163.tar.gz /composer-1.0.0-5cb2b52.tar.gz +/composer-1.0.0-91d92c4.tar.gz diff --git a/composer.spec b/composer.spec index 1794e5a..09b5742 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 5cb2b522637a941d608c58bd522f3b2a7bda4a1c +%global gh_commit 91d92c4ff80e4c6573a4dc91aee08e50d2617d30 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev #global gh_date 20160220 @@ -14,11 +14,11 @@ %global gh_project composer %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.0.0 -%global prever beta1 +%global prever beta2 Name: composer Version: 1.0.0 -Release: 0.21.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist} +Release: 0.22.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -214,6 +214,9 @@ fi %changelog +* Tue Mar 29 2016 Remi Collet - 1.0.0-0.22.beta2 +- update to 1.0.0beta2 + * Fri Mar 4 2016 Remi Collet - 1.0.0-0.21.beta1 - update to 1.0.0beta1 - raise dependency on justinrainbow/json-schema ^1.6 diff --git a/sources b/sources index 2b5005a..0311924 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fbb93bb86f2b66b2032e494bd71594fc composer-1.0.0-5cb2b52.tar.gz +e848f9a445f76291701efea0b0eb9f3e composer-1.0.0-91d92c4.tar.gz From eb3375d9de3d6ad607ea9c6d11cc5e5e4643fd5c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Apr 2016 16:28:26 +0200 Subject: [PATCH 05/73] v1.0.0 (cherry picked from commit 74b2a4e08c041cdadcad26d4cea906f4237c4c62) --- .gitignore | 1 + composer.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bbbc4ff..375df67 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /composer-1.0.0-4c0e163.tar.gz /composer-1.0.0-5cb2b52.tar.gz /composer-1.0.0-91d92c4.tar.gz +/composer-1.0.0-32df3aa.tar.gz diff --git a/composer.spec b/composer.spec index 09b5742..441ad05 100644 --- a/composer.spec +++ b/composer.spec @@ -6,19 +6,17 @@ # # Please, preserve the changelog entries # -%global gh_commit 91d92c4ff80e4c6573a4dc91aee08e50d2617d30 +%global gh_commit 32df3aa8cdbdaa16df9491b5e672e81c87f94c78 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev -#global gh_date 20160220 %global gh_owner composer %global gh_project composer %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.0.0 -%global prever beta2 Name: composer Version: 1.0.0 -Release: 0.22.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -214,6 +212,9 @@ fi %changelog +* Tue Apr 5 2016 Remi Collet - 1.0.0-1 +- update to 1.0.0 + * Tue Mar 29 2016 Remi Collet - 1.0.0-0.22.beta2 - update to 1.0.0beta2 diff --git a/sources b/sources index 0311924..840603c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e848f9a445f76291701efea0b0eb9f3e composer-1.0.0-91d92c4.tar.gz +e73873217bce554df2e036b734140377 composer-1.0.0-32df3aa.tar.gz From 1190112e60f4f55ee0fdb36602668325bc8b1511 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Apr 2016 07:53:00 +0200 Subject: [PATCH 06/73] - update to 1.0.1 - add dependency on ca-certificates - fix patch for RPM path (cherry picked from commit 3fa22bc39f7c8ee5d717a6669b617b5373e017bf) --- .gitignore | 1 + composer-rpm.patch | 59 ++++++++++++++++++++++++++++++++++++++++------ composer.spec | 20 ++++++++++++++-- sources | 2 +- 4 files changed, 72 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 375df67..7f39e21 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /composer-1.0.0-5cb2b52.tar.gz /composer-1.0.0-91d92c4.tar.gz /composer-1.0.0-32df3aa.tar.gz +/composer-1.0.1-de0e25b.tar.gz diff --git a/composer-rpm.patch b/composer-rpm.patch index 108900f..7021034 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2016-01-27 14:04:22.000000000 +0100 -+++ ./bin/composer 2016-01-27 16:32:11.313455545 +0100 +--- ./bin/composer.rpm 2016-04-18 22:14:28.000000000 +0200 ++++ ./bin/composer 2016-04-19 07:15:05.420424086 +0200 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') { echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL; } @@ -11,8 +11,8 @@ diff -up ./bin/composer.rpm ./bin/composer use Composer\Console\Application; diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php ---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2016-01-27 14:04:22.000000000 +0100 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2016-01-27 16:32:11.313455545 +0100 +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2016-04-18 22:14:28.000000000 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2016-04-19 07:15:05.421424090 +0200 @@ -287,7 +287,7 @@ EOF; file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader)); @@ -22,10 +22,31 @@ 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 2016-04-18 22:14:28.000000000 +0200 ++++ ./src/Composer/Compiler.php 2016-04-19 07:15:05.421424090 +0200 +@@ -96,7 +96,7 @@ class Compiler + $finder = new Finder(); + $finder->files() + ->name('*.json') +- ->in(__DIR__.'/../../res') ++ ->in((getenv('BUILDROOT')?:'') . '/usr/share/composer/res') + ->in(SpdxLicenses::getResourcesDir()) + ->sort($finderSort) + ; +@@ -138,7 +138,7 @@ class Compiler + } + $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/ClassLoader.php')); + +- $this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../res/cacert.pem'), false); ++ $this->addFile($phar, new \SplFileInfo((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'), false); + + $this->addComposerBin($phar); + diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2016-01-27 14:04:22.000000000 +0100 -+++ ./src/Composer/Json/JsonFile.php 2016-01-27 16:32:11.313455545 +0100 -@@ -155,7 +155,7 @@ class JsonFile +--- ./src/Composer/Json/JsonFile.php.rpm 2016-04-18 22:14:28.000000000 +0200 ++++ ./src/Composer/Json/JsonFile.php 2016-04-19 07:15:05.421424090 +0200 +@@ -156,7 +156,7 @@ class JsonFile self::validateSyntax($content, $this->path); } @@ -34,3 +55,27 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php $schemaData = json_decode(file_get_contents($schemaFile)); if ($schema === self::LAX_SCHEMA) { +diff -up ./src/Composer/Util/RemoteFilesystem.php.rpm ./src/Composer/Util/RemoteFilesystem.php +--- ./src/Composer/Util/RemoteFilesystem.php.rpm 2016-04-18 22:14:28.000000000 +0200 ++++ ./src/Composer/Util/RemoteFilesystem.php 2016-04-19 07:15:05.421424090 +0200 +@@ -925,7 +925,7 @@ class RemoteFilesystem + } + } + +- return $caPath = __DIR__.'/../../../res/cacert.pem'; // Bundled with Composer, last resort ++ return $caPath = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'; // Bundled with Composer, last resort + } + + /** +diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2016-04-19 07:15:19.122479957 +0200 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-04-19 07:15:45.229586410 +0200 +@@ -87,7 +87,7 @@ class ComposerSchemaTest extends \PHPUni + + private function check($json) + { +- $schema = json_decode(file_get_contents(__DIR__ . '/../../../../res/composer-schema.json')); ++ $schema = json_decode(file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json')); + $validator = new Validator(); + $validator->check(json_decode($json), $schema); + diff --git a/composer.spec b/composer.spec index 441ad05..bfcfce3 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 32df3aa8cdbdaa16df9491b5e672e81c87f94c78 +%global gh_commit de0e25b0d494ace6b571a9205b82d017e5cb9257 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -15,7 +15,7 @@ %global api_version 1.0.0 Name: composer -Version: 1.0.0 +Version: 1.0.1 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -53,6 +53,9 @@ BuildRequires: php-seld-phar-utils >= 1.0.1 BuildRequires: php-seld-cli-prompt >= 1.0.0-3 %endif +# ca-certificates +Requires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt + # From composer.json, "require": { # "php": "^5.3.2 || ^7.0", # "justinrainbow/json-schema": "^1.6", @@ -135,6 +138,11 @@ Documentation: https://getcomposer.org/doc/ %patch0 -p1 -b .rpm find . -name \*.rpm -exec rm {} \; -print +if grep -r '\.\./res'; then + : Patch need to fixed + exit 1 +fi + cp -p %{SOURCE1} src/Composer/autoload.php cp -p %{SOURCE2} tests/bootstrap.php rm src/bootstrap.php @@ -189,6 +197,9 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} rm tests/Composer/Test/Downloader/XzDownloaderTest.php %endif +: Ensure not used +rm -rf res + : Run test suite export BUILDROOT=%{buildroot} %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose @@ -212,6 +223,11 @@ fi %changelog +* Tue Apr 19 2016 Remi Collet - 1.0.1-1 +- update to 1.0.1 +- add dependency on ca-certificates +- fix patch for RPM path + * Tue Apr 5 2016 Remi Collet - 1.0.0-1 - update to 1.0.0 diff --git a/sources b/sources index 840603c..c635f47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e73873217bce554df2e036b734140377 composer-1.0.0-32df3aa.tar.gz +d66d0b82133805cd63e59fffb0163563 composer-1.0.1-de0e25b.tar.gz From 2954e4b77bf2f9fead7e3f981aaf099950b8bb95 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Apr 2016 13:58:16 +0200 Subject: [PATCH 07/73] v1.0.2 (cherry picked from commit 3696482baaf2ff2850e25a8c1db76f7e9f022c28) --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7f39e21..de1b746 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /composer-1.0.0-91d92c4.tar.gz /composer-1.0.0-32df3aa.tar.gz /composer-1.0.1-de0e25b.tar.gz +/composer-1.0.2-a083aa5.tar.gz diff --git a/composer.spec b/composer.spec index bfcfce3..ee02b1e 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit de0e25b0d494ace6b571a9205b82d017e5cb9257 +%global gh_commit a083aa5e0c9b8ad989c622638aa380c1f88a68ec %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -15,7 +15,7 @@ %global api_version 1.0.0 Name: composer -Version: 1.0.1 +Version: 1.0.2 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -223,6 +223,9 @@ fi %changelog +* Thu Apr 21 2016 Remi Collet - 1.0.2-1 +- update to 1.0.2 + * Tue Apr 19 2016 Remi Collet - 1.0.1-1 - update to 1.0.1 - add dependency on ca-certificates diff --git a/sources b/sources index c635f47..fe52527 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d66d0b82133805cd63e59fffb0163563 composer-1.0.1-de0e25b.tar.gz +cf1a09296e2be6323057e01376bdbdbc composer-1.0.2-a083aa5.tar.gz From 2b2d99f523ac784af91cffb55af928efdffc58bf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 30 Apr 2016 10:03:28 +0200 Subject: [PATCH 08/73] v1.0.3 (cherry picked from commit 5c4fbe6d7a9e43eb8073313393d4fa1bae7f0b46) --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index de1b746..8d10775 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /composer-1.0.0-32df3aa.tar.gz /composer-1.0.1-de0e25b.tar.gz /composer-1.0.2-a083aa5.tar.gz +/composer-1.0.3-a4a0546.tar.gz diff --git a/composer.spec b/composer.spec index ee02b1e..a0a9177 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit a083aa5e0c9b8ad989c622638aa380c1f88a68ec +%global gh_commit a4a0546ece469cae984219f920c75437820064ff %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -15,7 +15,7 @@ %global api_version 1.0.0 Name: composer -Version: 1.0.2 +Version: 1.0.3 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -223,6 +223,9 @@ fi %changelog +* Sat Apr 30 2016 Remi Collet - 1.0.3-1 +- update to 1.0.3 + * Thu Apr 21 2016 Remi Collet - 1.0.2-1 - update to 1.0.2 diff --git a/sources b/sources index fe52527..5b42d27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf1a09296e2be6323057e01376bdbdbc composer-1.0.2-a083aa5.tar.gz +3e17588910ceb57d1fa8b34a0b1b20a5 composer-1.0.3-a4a0546.tar.gz From b6c8059b4c8f0fcc8300a28a55eecc4afc88662a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 May 2016 08:13:35 +0200 Subject: [PATCH 09/73] - update to 1.1.1 - add dependency on composer/ca-bundle - add dependency on psr/log - bump composer-plugin-api to 1.1.0 - drop dependency on ca-certificates (cherry picked from commit e0b9e34fc22dc8bff30d2ec9f9b1703107b87c54) --- .gitignore | 1 + composer-autoload.php | 3 +++ composer-rpm.patch | 47 ++++++++++++------------------------------- composer.spec | 35 +++++++++++++++++++++++--------- sources | 2 +- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 8d10775..3f622ea 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /composer-1.0.1-de0e25b.tar.gz /composer-1.0.2-a083aa5.tar.gz /composer-1.0.3-a4a0546.tar.gz +/composer-1.1.1-48156b0.tar.gz diff --git a/composer-autoload.php b/composer-autoload.php index 811b39c..31197f5 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -21,6 +21,9 @@ $fedoraClassLoader->addPrefixes(array( require_once $vendorDir . '/Seld/JsonLint/autoload.php'; require_once $vendorDir . '/Seld/PharUtils/autoload.php'; require_once $vendorDir . '/Seld/CliPrompt/autoload.php'; +require_once $vendorDir . '/Composer/CaBundle/autoload.php'; require_once $vendorDir . '/Composer/Spdx/autoload.php'; require_once $vendorDir . '/Composer/Semver/autoload.php'; require_once $vendorDir . '/JsonSchema/autoload.php'; +require_once $vendorDir . '/Psr/Log/autoload.php'; + diff --git a/composer-rpm.patch b/composer-rpm.patch index 7021034..2e2d330 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2016-04-18 22:14:28.000000000 +0200 -+++ ./bin/composer 2016-04-19 07:15:05.420424086 +0200 +--- ./bin/composer.rpm 2016-04-29 18:32:14.000000000 +0200 ++++ ./bin/composer 2016-04-30 10:07:31.835289957 +0200 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') { echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL; } @@ -11,10 +11,10 @@ diff -up ./bin/composer.rpm ./bin/composer use Composer\Console\Application; diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php ---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2016-04-18 22:14:28.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2016-04-19 07:15:05.421424090 +0200 -@@ -287,7 +287,7 @@ EOF; - file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader)); +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2016-04-30 10:07:31.836289961 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2016-04-30 10:08:50.489640789 +0200 +@@ -288,7 +288,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'); - $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE'); @@ -23,9 +23,9 @@ 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 2016-04-18 22:14:28.000000000 +0200 -+++ ./src/Composer/Compiler.php 2016-04-19 07:15:05.421424090 +0200 -@@ -96,7 +96,7 @@ class Compiler +--- ./src/Composer/Compiler.php.rpm 2016-04-29 18:32:14.000000000 +0200 ++++ ./src/Composer/Compiler.php 2016-04-30 10:07:31.836289961 +0200 +@@ -97,7 +97,7 @@ class Compiler $finder = new Finder(); $finder->files() ->name('*.json') @@ -34,18 +34,9 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ->in(SpdxLicenses::getResourcesDir()) ->sort($finderSort) ; -@@ -138,7 +138,7 @@ class Compiler - } - $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/ClassLoader.php')); - -- $this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../res/cacert.pem'), false); -+ $this->addFile($phar, new \SplFileInfo((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'), false); - - $this->addComposerBin($phar); - diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2016-04-18 22:14:28.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2016-04-19 07:15:05.421424090 +0200 +--- ./src/Composer/Json/JsonFile.php.rpm 2016-04-29 18:32:14.000000000 +0200 ++++ ./src/Composer/Json/JsonFile.php 2016-04-30 10:07:31.836289961 +0200 @@ -156,7 +156,7 @@ class JsonFile self::validateSyntax($content, $this->path); } @@ -55,21 +46,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php $schemaData = json_decode(file_get_contents($schemaFile)); if ($schema === self::LAX_SCHEMA) { -diff -up ./src/Composer/Util/RemoteFilesystem.php.rpm ./src/Composer/Util/RemoteFilesystem.php ---- ./src/Composer/Util/RemoteFilesystem.php.rpm 2016-04-18 22:14:28.000000000 +0200 -+++ ./src/Composer/Util/RemoteFilesystem.php 2016-04-19 07:15:05.421424090 +0200 -@@ -925,7 +925,7 @@ class RemoteFilesystem - } - } - -- return $caPath = __DIR__.'/../../../res/cacert.pem'; // Bundled with Composer, last resort -+ return $caPath = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/cacert.pem'; // Bundled with Composer, last resort - } - - /** diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php ---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2016-04-19 07:15:19.122479957 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-04-19 07:15:45.229586410 +0200 +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2016-04-29 18:32:14.000000000 +0200 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-04-30 10:07:31.836289961 +0200 @@ -87,7 +87,7 @@ class ComposerSchemaTest extends \PHPUni private function check($json) diff --git a/composer.spec b/composer.spec index a0a9177..e905271 100644 --- a/composer.spec +++ b/composer.spec @@ -6,23 +6,24 @@ # # Please, preserve the changelog entries # -%global gh_commit a4a0546ece469cae984219f920c75437820064ff +%global gh_commit 48156b0fd9888bf528fbe9c9cba6963223cdd584 %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.0.0 +%global api_version 1.1.0 +#global prever RC Name: composer -Version: 1.0.3 +Version: 1.1.1 Release: 1%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries License: MIT URL: https://getcomposer.org/ -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz Source1: %{name}-autoload.php Source2: %{name}-bootstrap.php @@ -34,10 +35,12 @@ BuildRequires: php-cli %if %{with_tests} BuildRequires: php-composer(justinrainbow/json-schema) >= 1.6 BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 +BuildRequires: php-composer(composer/ca-bundle) >= 1.0 BuildRequires: php-composer(composer/semver) >= 1.0 BuildRequires: php-composer(seld/jsonlint) >= 1.4 BuildRequires: php-composer(seld/phar-utils) >= 1.0 BuildRequires: php-composer(seld/cli-prompt) >= 1.0 +BuildRequires: php-composer(psr/log) >= 1.0 BuildRequires: php-composer(symfony/console) >= 2.5 BuildRequires: php-composer(symfony/finder) >= 2.2 BuildRequires: php-composer(symfony/filesystem) >= 2.5 @@ -51,29 +54,31 @@ BuildRequires: php-composer(phpunit/phpunit) >= 4.5 BuildRequires: php-composer(symfony/class-loader) BuildRequires: php-seld-phar-utils >= 1.0.1 BuildRequires: php-seld-cli-prompt >= 1.0.0-3 +BuildRequires: php-PsrLog >= 1.0.0-8 %endif -# ca-certificates -Requires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt - # From composer.json, "require": { # "php": "^5.3.2 || ^7.0", # "justinrainbow/json-schema": "^1.6", -# "composer/spdx-licenses": "^1.0", +# "composer/ca-bundle": "^1.0", # "composer/semver": "^1.0", +# "composer/spdx-licenses": "^1.0", # "seld/jsonlint": "~1.4", # "symfony/console": "^2.5 || ^3.0", # "symfony/finder": "^2.2 || ^3.0", # "symfony/process": "^2.1 || ^3.0", # "symfony/filesystem": "^2.5 || ^3.0", # "seld/phar-utils": "^1.0", -# "seld/cli-prompt": "^1.0" +# "seld/cli-prompt": "^1.0", +# "psr/log": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-composer(justinrainbow/json-schema) >= 1.6 Requires: php-composer(justinrainbow/json-schema) < 2 Requires: php-composer(composer/spdx-licenses) >= 1.0 Requires: php-composer(composer/spdx-licenses) < 2 +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(seld/jsonlint) >= 1.4 @@ -82,6 +87,8 @@ Requires: php-composer(seld/phar-utils) >= 1.0 Requires: php-composer(seld/phar-utils) < 2 Requires: php-composer(seld/cli-prompt) >= 1.0 Requires: php-composer(seld/cli-prompt) < 2 +Requires: php-composer(psr/log) >= 1.0 +Requires: php-composer(psr/log) < 2 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 4 Requires: php-composer(symfony/finder) >= 2.2 @@ -99,6 +106,7 @@ Requires: php-openssl Requires: php-composer(symfony/class-loader) Requires: php-seld-phar-utils >= 1.0.1 Requires: php-seld-cli-prompt >= 1.0.0-3 +Requires: php-PsrLog >= 1.0.0-8 # From phpcompatinfo Requires: php-curl Requires: php-date @@ -196,6 +204,8 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %if 0%{?rhel} == 5 rm tests/Composer/Test/Downloader/XzDownloaderTest.php %endif +sed -e 's/testDispatcherCanConvertScriptEventToCommandEventForListener/SKIP1/' \ + -i tests/Composer/Test/EventDispatcher/EventDispatcherTest.php : Ensure not used rm -rf res @@ -223,6 +233,13 @@ fi %changelog +* Tue May 17 2016 Remi Collet - 1.1.1-1 +- update to 1.1.1 +- add dependency on composer/ca-bundle +- add dependency on psr/log +- bump composer-plugin-api to 1.1.0 +- drop dependency on ca-certificates + * Sat Apr 30 2016 Remi Collet - 1.0.3-1 - update to 1.0.3 diff --git a/sources b/sources index 5b42d27..f58ae63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e17588910ceb57d1fa8b34a0b1b20a5 composer-1.0.3-a4a0546.tar.gz +316f16ccf9f049bf0b845ee56b2aa452 composer-1.1.1-48156b0.tar.gz From 69f21c3af91d3c25d3012a58615e8d63761ff98a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 31 May 2016 08:09:26 +0200 Subject: [PATCH 10/73] ensure justinrainbow/json-schema v1 is used for the build --- composer.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.spec b/composer.spec index e905271..3595b6b 100644 --- a/composer.spec +++ b/composer.spec @@ -17,7 +17,7 @@ Name: composer Version: 1.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -34,6 +34,7 @@ BuildArch: noarch BuildRequires: php-cli %if %{with_tests} BuildRequires: php-composer(justinrainbow/json-schema) >= 1.6 +BuildRequires: php-composer(justinrainbow/json-schema) < 2 BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 BuildRequires: php-composer(composer/ca-bundle) >= 1.0 BuildRequires: php-composer(composer/semver) >= 1.0 @@ -233,6 +234,9 @@ fi %changelog +* Tue May 31 2016 Remi Collet - 1.1.1-2 +- ensure justinrainbow/json-schema v1 is used for the build + * Tue May 17 2016 Remi Collet - 1.1.1-1 - update to 1.1.1 - add dependency on composer/ca-bundle From 1e6f4b0a0f3c4f9523a1cc18848ef90d929486e3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Jun 2016 07:25:07 +0200 Subject: [PATCH 11/73] v1.1.2 (cherry picked from commit ef9b12e09734c226ec548408015904aff77eb49d) --- .gitignore | 1 + composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3f622ea..03113c7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /composer-1.0.2-a083aa5.tar.gz /composer-1.0.3-a4a0546.tar.gz /composer-1.1.1-48156b0.tar.gz +/composer.spec diff --git a/composer.spec b/composer.spec index 3595b6b..c03560c 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 48156b0fd9888bf528fbe9c9cba6963223cdd584 +%global gh_commit b2cf67b1a575d7e648c742be2454339232ef32b2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,8 +16,8 @@ #global prever RC Name: composer -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -234,6 +234,9 @@ fi %changelog +* Wed Jun 1 2016 Remi Collet - 1.1.2-1 +- update to 1.1.2 + * Tue May 31 2016 Remi Collet - 1.1.1-2 - ensure justinrainbow/json-schema v1 is used for the build diff --git a/sources b/sources index f58ae63..1853ae8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -316f16ccf9f049bf0b845ee56b2aa452 composer-1.1.1-48156b0.tar.gz +beb3a51cc02d9c1cf0c4b46944a750ca composer.spec From 02c22762965ebeb2fe44ff80526b434490c53fb3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Jun 2016 07:31:28 +0200 Subject: [PATCH 12/73] 1.1.2 sources (cherry picked from commit e73788f35cf850f4e209da37bbd8c843aaad84da) --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 03113c7..5931ac1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /composer-1.0.3-a4a0546.tar.gz /composer-1.1.1-48156b0.tar.gz /composer.spec +/composer-1.1.2-b2cf67b.tar.gz diff --git a/sources b/sources index 1853ae8..a9b6576 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -beb3a51cc02d9c1cf0c4b46944a750ca composer.spec +96607e6d13fd78dcdd7c5d56b755a487 composer-1.1.2-b2cf67b.tar.gz From 27a98a762daf6e2f34cc6052eaf136e283a9e4d1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Jun 2016 07:46:20 +0200 Subject: [PATCH 13/73] 1.1.2 changelog --- composer.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/composer.spec b/composer.spec index c03560c..cdb54aa 100644 --- a/composer.spec +++ b/composer.spec @@ -236,8 +236,6 @@ fi %changelog * Wed Jun 1 2016 Remi Collet - 1.1.2-1 - update to 1.1.2 - -* Tue May 31 2016 Remi Collet - 1.1.1-2 - ensure justinrainbow/json-schema v1 is used for the build * Tue May 17 2016 Remi Collet - 1.1.1-1 From 026c142e2f9e5de989bdb4e3ba052ed35540338c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 26 Jun 2016 18:53:01 +0200 Subject: [PATCH 14/73] v1.1.3 (cherry picked from commit 093bdcdd637a83e6f1fd89cd64fd90c7a1d8a5c6) --- .gitignore | 1 + composer.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5931ac1..e12a698 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /composer-1.1.1-48156b0.tar.gz /composer.spec /composer-1.1.2-b2cf67b.tar.gz +/composer-1.1.3-30ab6f1.tar.gz diff --git a/composer.spec b/composer.spec index cdb54aa..5f71577 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit b2cf67b1a575d7e648c742be2454339232ef32b2 +%global gh_commit 30ab6f1c1753267d181839142fafe022313c3c9a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.1.2 +Version: 1.1.3 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -215,8 +215,8 @@ rm -rf res export BUILDROOT=%{buildroot} %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose -if which php70; then - php70 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose +if which php71; then + php71 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose fi %else : Test suite disabled @@ -234,6 +234,9 @@ fi %changelog +* Sun Jun 26 2016 Remi Collet - 1.1.3-1 +- update to 1.1.3 + * Wed Jun 1 2016 Remi Collet - 1.1.2-1 - update to 1.1.2 - ensure justinrainbow/json-schema v1 is used for the build diff --git a/sources b/sources index a9b6576..fd560a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96607e6d13fd78dcdd7c5d56b755a487 composer-1.1.2-b2cf67b.tar.gz +55b46597ce2e840cc04729117bce821c composer-1.1.3-30ab6f1.tar.gz From 1f3d313ab944ceb4a2b92b1516a00d6bc8e929c0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Jul 2016 14:50:34 +0200 Subject: [PATCH 15/73] - update to 1.2.0 - switch to justinrainbow/json-schema v2 (cherry picked from commit 086bb572555bf801a237294d4ac3926ce51d9c14) --- .gitignore | 1 + composer.spec | 23 +++++++++++------------ sources | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e12a698..573d065 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /composer.spec /composer-1.1.2-b2cf67b.tar.gz /composer-1.1.3-30ab6f1.tar.gz +/composer-1.2.0-b49a006.tar.gz diff --git a/composer.spec b/composer.spec index 5f71577..8bb9c41 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 30ab6f1c1753267d181839142fafe022313c3c9a +%global gh_commit b49a006748a460f8dae6500ec80ed021501ce969 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.1.3 +Version: 1.2.0 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -33,8 +33,7 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php-cli %if %{with_tests} -BuildRequires: php-composer(justinrainbow/json-schema) >= 1.6 -BuildRequires: php-composer(justinrainbow/json-schema) < 2 +BuildRequires: php-composer(justinrainbow/json-schema) >= 2.0 BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 BuildRequires: php-composer(composer/ca-bundle) >= 1.0 BuildRequires: php-composer(composer/semver) >= 1.0 @@ -49,7 +48,7 @@ BuildRequires: php-composer(symfony/process) >= 2.1 BuildRequires: php-zip # From composer.json, "require-dev": { # "phpunit/phpunit": "^4.5 || ^5.0.5", -# "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0" +# "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" BuildRequires: php-composer(phpunit/phpunit) >= 4.5 # For autoloader BuildRequires: php-composer(symfony/class-loader) @@ -60,7 +59,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # From composer.json, "require": { # "php": "^5.3.2 || ^7.0", -# "justinrainbow/json-schema": "^1.6", +# "justinrainbow/json-schema": "^1.6 || ^2.0", # "composer/ca-bundle": "^1.0", # "composer/semver": "^1.0", # "composer/spdx-licenses": "^1.0", @@ -74,8 +73,8 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # "psr/log": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli -Requires: php-composer(justinrainbow/json-schema) >= 1.6 -Requires: php-composer(justinrainbow/json-schema) < 2 +Requires: php-composer(justinrainbow/json-schema) >= 2.0 +Requires: php-composer(justinrainbow/json-schema) < 3 Requires: php-composer(composer/spdx-licenses) >= 1.0 Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/ca-bundle) >= 1.0 @@ -214,10 +213,6 @@ rm -rf res : Run test suite export BUILDROOT=%{buildroot} %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose - -if which php71; then - php71 %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose -fi %else : Test suite disabled %endif @@ -234,6 +229,10 @@ fi %changelog +* Tue Jul 19 2016 Remi Collet - 1.2.0-1 +- update to 1.2.0 +- switch to justinrainbow/json-schema v2 + * Sun Jun 26 2016 Remi Collet - 1.1.3-1 - update to 1.1.3 diff --git a/sources b/sources index fd560a1..8b0c16e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55b46597ce2e840cc04729117bce821c composer-1.1.3-30ab6f1.tar.gz +aea538bd668b42a39b391060c5d48bdc composer-1.2.0-b49a006.tar.gz From a6f2df7cb25ad89ce39da0ffc0c984dda882e028 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Jul 2016 14:59:23 +0200 Subject: [PATCH 16/73] fix autoload (cherry picked from commit fa5704c12d8f044dd573bc9a54d343f437aade38) --- composer-autoload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer-autoload.php b/composer-autoload.php index 31197f5..062bbe4 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -24,6 +24,6 @@ require_once $vendorDir . '/Seld/CliPrompt/autoload.php'; require_once $vendorDir . '/Composer/CaBundle/autoload.php'; require_once $vendorDir . '/Composer/Spdx/autoload.php'; require_once $vendorDir . '/Composer/Semver/autoload.php'; -require_once $vendorDir . '/JsonSchema/autoload.php'; +require_once $vendorDir . '/JsonSchema2/autoload.php'; require_once $vendorDir . '/Psr/Log/autoload.php'; From cd8a37bbf3e48cdeafa81047bc776e80d9517b2c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Sep 2016 15:08:58 +0200 Subject: [PATCH 17/73] v1.2.1 (cherry picked from commit 4f2b4fe52aeff78bbd7b2937837ba13e2358007a) --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 573d065..548fedb 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /composer-1.1.2-b2cf67b.tar.gz /composer-1.1.3-30ab6f1.tar.gz /composer-1.2.0-b49a006.tar.gz +/composer-1.2.1-16422c4.tar.gz diff --git a/composer.spec b/composer.spec index 8bb9c41..b450ee7 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit b49a006748a460f8dae6500ec80ed021501ce969 +%global gh_commit 16422c4b1ac4286f7caecf5211136dc073191672 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.2.0 +Version: 1.2.1 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -229,6 +229,9 @@ export BUILDROOT=%{buildroot} %changelog +* Mon Sep 12 2016 Remi Collet - 1.2.1-1 +- update to 1.2.1 + * Tue Jul 19 2016 Remi Collet - 1.2.0-1 - update to 1.2.0 - switch to justinrainbow/json-schema v2 diff --git a/sources b/sources index 8b0c16e..475b435 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aea538bd668b42a39b391060c5d48bdc composer-1.2.0-b49a006.tar.gz +c096bd37ec8a1107edc3383962600d41 composer-1.2.1-16422c4.tar.gz From 6dd65a9d66dd242782719a97aad0ce9d860b0b84 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Nov 2016 06:43:55 +0100 Subject: [PATCH 18/73] - update to 1.2.2 - switch from symfony/class-loader to fedora/autoloader (cherry picked from commit ab28d76a951adf7feee53253f7ef16b32800f456) --- .gitignore | 1 + composer-autoload.php | 34 ++++++++++++++-------------------- composer-bootstrap.php | 4 +++- composer.spec | 12 ++++++++---- sources | 2 +- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 548fedb..8b67535 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ clog /composer-1.1.3-30ab6f1.tar.gz /composer-1.2.0-b49a006.tar.gz /composer-1.2.1-16422c4.tar.gz +/composer-1.2.2-5465af9.tar.gz diff --git a/composer-autoload.php b/composer-autoload.php index 062bbe4..c103501 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -2,28 +2,22 @@ /* Autoloader for composer/composer and its dependencies */ $vendorDir = '/usr/share/php'; -// Use Symfony autoloader -if (!isset($fedoraClassLoader) || !($fedoraClassLoader instanceof \Symfony\Component\ClassLoader\ClassLoader)) { - if (!class_exists('Symfony\\Component\\ClassLoader\\ClassLoader', false)) { - require_once $vendorDir . '/Symfony/Component/ClassLoader/ClassLoader.php'; - } - - $fedoraClassLoader = new \Symfony\Component\ClassLoader\ClassLoader(); - $fedoraClassLoader->register(); +if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { + require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; } -$fedoraClassLoader->addPrefixes(array( - 'Symfony\\Component\\' => $vendorDir, - 'Composer\\' => dirname(__DIR__) -)); +\Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__); // Dependencies -require_once $vendorDir . '/Seld/JsonLint/autoload.php'; -require_once $vendorDir . '/Seld/PharUtils/autoload.php'; -require_once $vendorDir . '/Seld/CliPrompt/autoload.php'; -require_once $vendorDir . '/Composer/CaBundle/autoload.php'; -require_once $vendorDir . '/Composer/Spdx/autoload.php'; -require_once $vendorDir . '/Composer/Semver/autoload.php'; -require_once $vendorDir . '/JsonSchema2/autoload.php'; -require_once $vendorDir . '/Psr/Log/autoload.php'; +\Fedora\Autoloader\Dependencies::required(array( + $vendorDir . '/Symfony/Component/autoload.php', + $vendorDir . '/Seld/JsonLint/autoload.php', + $vendorDir . '/Seld/PharUtils/autoload.php', + $vendorDir . '/Seld/CliPrompt/autoload.php', + $vendorDir . '/Composer/CaBundle/autoload.php', + $vendorDir . '/Composer/Spdx/autoload.php', + $vendorDir . '/Composer/Semver/autoload.php', + $vendorDir . '/JsonSchema2/autoload.php', + $vendorDir . '/Psr/Log/autoload.php', +)); diff --git a/composer-bootstrap.php b/composer-bootstrap.php index 713835a..5440159 100644 --- a/composer-bootstrap.php +++ b/composer-bootstrap.php @@ -1,4 +1,6 @@ addPrefix('Composer\\Test\\', __DIR__); +/* \Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/'); broken for now */ +\Fedora\Autoloader\Autoload::addPsr4('Composer\\Test\\', __DIR__ . '/Composer/Test'); require __DIR__.'/Composer/TestCase.php'; + diff --git a/composer.spec b/composer.spec index b450ee7..ef21b5a 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 16422c4b1ac4286f7caecf5211136dc073191672 +%global gh_commit 5465af955800fa884a36f66ff65280584988efd0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.2.1 +Version: 1.2.2 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -51,7 +51,7 @@ BuildRequires: php-zip # "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" BuildRequires: php-composer(phpunit/phpunit) >= 4.5 # For autoloader -BuildRequires: php-composer(symfony/class-loader) +BuildRequires: php-composer(fedora/autoloader) >= 0.1.2 BuildRequires: php-seld-phar-utils >= 1.0.1 BuildRequires: php-seld-cli-prompt >= 1.0.0-3 BuildRequires: php-PsrLog >= 1.0.0-8 @@ -103,7 +103,7 @@ Requires: php-composer(symfony/filesystem) < 4 Requires: php-zip Requires: php-openssl # For our autoloader -Requires: php-composer(symfony/class-loader) +Requires: php-composer(fedora/autoloader) Requires: php-seld-phar-utils >= 1.0.1 Requires: php-seld-cli-prompt >= 1.0.0-3 Requires: php-PsrLog >= 1.0.0-8 @@ -229,6 +229,10 @@ export BUILDROOT=%{buildroot} %changelog +* Thu Nov 3 2016 Remi Collet - 1.2.2-1 +- update to 1.2.2 +- switch from symfony/class-loader to fedora/autoloader + * Mon Sep 12 2016 Remi Collet - 1.2.1-1 - update to 1.2.1 diff --git a/sources b/sources index 475b435..3858650 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c096bd37ec8a1107edc3383962600d41 composer-1.2.1-16422c4.tar.gz +c245b655f8755ab374879dbaace5067f composer-1.2.2-5465af9.tar.gz From ef41bbabe59b12ffedb60dde9b1a70d1bcfce7a7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Dec 2016 16:56:09 +0100 Subject: [PATCH 19/73] update to 1.2.3 - add profile scripts so globally installed commands will be found in default user path #1394577 (cherry picked from commit 6812674201247380f62fa8359d3a32906dd88547) --- .gitignore | 1 + composer.csh | 9 +++++++++ composer.sh | 11 +++++++++++ composer.spec | 17 +++++++++++++++-- sources | 2 +- 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 composer.csh create mode 100644 composer.sh diff --git a/.gitignore b/.gitignore index 8b67535..e3f249f 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /composer-1.2.0-b49a006.tar.gz /composer-1.2.1-16422c4.tar.gz /composer-1.2.2-5465af9.tar.gz +/composer-1.2.3-e7f1928.tar.gz diff --git a/composer.csh b/composer.csh new file mode 100644 index 0000000..b57b1d0 --- /dev/null +++ b/composer.csh @@ -0,0 +1,9 @@ +# Composer initialization script + +# Add path to commands installed using "composer global require ..." +if ( ${euid} > 0 ) then + if ( "${path}" !~ *${HOME}/.composer/vendor/bin* ) then + set path = ( $path ${HOME}/.composer/vendor/bin ) + endif +endif + diff --git a/composer.sh b/composer.sh new file mode 100644 index 0000000..c75753c --- /dev/null +++ b/composer.sh @@ -0,0 +1,11 @@ +# Composer initialization script + +# Add path to commands installed using "composer global require ..." +if [ "${EUID:-0}" != "0" ]; then + case :$PATH: in + *:${HOME}/.composer/vendor/bin:*) ;; + *) PATH=$PATH:${HOME}/.composer/vendor/bin ;; + esac + export PATH +fi + diff --git a/composer.spec b/composer.spec index ef21b5a..b0372a4 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 5465af955800fa884a36f66ff65280584988efd0 +%global gh_commit e7f19286a7e7f940950c9069a0f549d483c30ba7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.2.2 +Version: 1.2.3 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -26,6 +26,9 @@ URL: https://getcomposer.org/ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz Source1: %{name}-autoload.php Source2: %{name}-bootstrap.php +# Profile scripts +Source3: %{name}.sh +Source4: %{name}.csh # Use our autoloader, resources path, fix for tests Patch0: %{name}-rpm.patch @@ -184,6 +187,10 @@ if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) { %install +: Profile scripts +mkdir -p %{buildroot}%{_sysconfdir}/profile.d +install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/ + : Library mkdir -p %{buildroot}%{_datadir}/php cp -pr src/* %{buildroot}%{_datadir}/php @@ -223,12 +230,18 @@ export BUILDROOT=%{buildroot} %license LICENSE %doc *.md doc %doc composer.json +%config(noreplace) %{_sysconfdir}/profile.d/%{name}.* %{_bindir}/%{name} %{_datadir}/php/Composer %{_datadir}/%{name} %changelog +* Thu Dec 1 2016 Remi Collet - 1.2.3-1 +- update to 1.2.3 +- add profile scripts so globally installed commands + will be found in default user path #1394577 + * Thu Nov 3 2016 Remi Collet - 1.2.2-1 - update to 1.2.2 - switch from symfony/class-loader to fedora/autoloader diff --git a/sources b/sources index 3858650..0ac6242 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c245b655f8755ab374879dbaace5067f composer-1.2.2-5465af9.tar.gz +7f61b95d9708ea1d66779be2d0c85c09 composer-1.2.3-e7f1928.tar.gz From b529ebf38c29a09a39d1adfd83d208fef09213b5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 7 Dec 2016 08:56:12 +0100 Subject: [PATCH 20/73] v1.2.4 (cherry picked from commit 30cfbb6d3b73b400f83df9797cd57d47cb786a88) --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e3f249f..f051af5 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /composer-1.2.1-16422c4.tar.gz /composer-1.2.2-5465af9.tar.gz /composer-1.2.3-e7f1928.tar.gz +/composer-1.2.4-7895e4a.tar.gz diff --git a/composer.spec b/composer.spec index b0372a4..a6bc4ac 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit e7f19286a7e7f940950c9069a0f549d483c30ba7 +%global gh_commit 7895e4a7e0e05b06e0ebfae96fc154c6a2ba75f0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -237,6 +237,9 @@ export BUILDROOT=%{buildroot} %changelog +* Wed Dec 7 2016 Remi Collet - 1.2.4-1 +- update to 1.2.4 + * Thu Dec 1 2016 Remi Collet - 1.2.3-1 - update to 1.2.3 - add profile scripts so globally installed commands diff --git a/sources b/sources index 0ac6242..766e476 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f61b95d9708ea1d66779be2d0c85c09 composer-1.2.3-e7f1928.tar.gz +c99da49027f8666de6919d03eed74978 composer-1.2.4-7895e4a.tar.gz From 66dfe3538f1aefcf2388e25cb21be3520c127616 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 24 Dec 2016 08:55:38 +0100 Subject: [PATCH 21/73] update to 1.3.0 raise dependency on symfony 2.7 allow justinrainbow/json-schema 4 (cherry picked from commit e43c2f2a891321ad1b91a18f0089a15a7710f3a0) --- .gitignore | 25 +------------------------ composer-autoload.php | 10 +++++----- composer-bootstrap.php | 3 +-- composer-rpm.patch | 28 ++++++++++++++-------------- composer.spec | 29 +++++++++++++++++------------ sources | 2 +- 6 files changed, 39 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index f051af5..5248737 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,2 @@ clog -/composer-1.0.0-00c2679.tar.gz -/composer-1.0.0-c83650f.tar.gz -/composer-1.0.0-9f6fdfd.tar.gz -/composer-1.0.0-7a9eb02.tar.gz -/composer-1.0.0-a54f84f.tar.gz -/composer-1.0.0-5a5088e.tar.gz -/composer-1.0.0-cd9054c.tar.gz -/composer-1.0.0-64b0d72.tar.gz -/composer-1.0.0-4c0e163.tar.gz -/composer-1.0.0-5cb2b52.tar.gz -/composer-1.0.0-91d92c4.tar.gz -/composer-1.0.0-32df3aa.tar.gz -/composer-1.0.1-de0e25b.tar.gz -/composer-1.0.2-a083aa5.tar.gz -/composer-1.0.3-a4a0546.tar.gz -/composer-1.1.1-48156b0.tar.gz -/composer.spec -/composer-1.1.2-b2cf67b.tar.gz -/composer-1.1.3-30ab6f1.tar.gz -/composer-1.2.0-b49a006.tar.gz -/composer-1.2.1-16422c4.tar.gz -/composer-1.2.2-5465af9.tar.gz -/composer-1.2.3-e7f1928.tar.gz -/composer-1.2.4-7895e4a.tar.gz +/composer-1.3.0-e53f9e5.tar.gz diff --git a/composer-autoload.php b/composer-autoload.php index c103501..e36e932 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -2,9 +2,7 @@ /* Autoloader for composer/composer and its dependencies */ $vendorDir = '/usr/share/php'; -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} +require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__); @@ -17,7 +15,9 @@ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { $vendorDir . '/Composer/CaBundle/autoload.php', $vendorDir . '/Composer/Spdx/autoload.php', $vendorDir . '/Composer/Semver/autoload.php', - $vendorDir . '/JsonSchema2/autoload.php', $vendorDir . '/Psr/Log/autoload.php', -)); + array( + $vendorDir . '/JsonSchema4/autoload.php', + $vendorDir . '/JsonSchema2/autoload.php', +))); diff --git a/composer-bootstrap.php b/composer-bootstrap.php index 5440159..279f1cc 100644 --- a/composer-bootstrap.php +++ b/composer-bootstrap.php @@ -1,6 +1,5 @@ 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 2016-04-29 18:32:14.000000000 +0200 -+++ ./src/Composer/Compiler.php 2016-04-30 10:07:31.836289961 +0200 +--- ./src/Composer/Compiler.php.rpm 2016-12-11 17:04:50.000000000 +0100 ++++ ./src/Composer/Compiler.php 2016-12-12 10:30:58.175009567 +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 2016-04-29 18:32:14.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2016-04-30 10:07:31.836289961 +0200 +--- ./src/Composer/Json/JsonFile.php.rpm 2016-12-11 17:04:50.000000000 +0100 ++++ ./src/Composer/Json/JsonFile.php 2016-12-12 10:30:58.175009567 +0100 @@ -156,7 +156,7 @@ class JsonFile self::validateSyntax($content, $this->path); } @@ -47,9 +47,9 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php if ($schema === self::LAX_SCHEMA) { diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php ---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2016-04-29 18:32:14.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-04-30 10:07:31.836289961 +0200 -@@ -87,7 +87,7 @@ class ComposerSchemaTest extends \PHPUni +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2016-12-11 17:04:50.000000000 +0100 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-12-12 10:30:58.175009567 +0100 +@@ -95,7 +95,7 @@ class ComposerSchemaTest extends \PHPUni private function check($json) { diff --git a/composer.spec b/composer.spec index a6bc4ac..8b23892 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 7895e4a7e0e05b06e0ebfae96fc154c6a2ba75f0 +%global gh_commit e53f9e5381e70f76e098136343e27d92601eade7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.2.4 +Version: 1.3.0 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -62,22 +62,22 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # From composer.json, "require": { # "php": "^5.3.2 || ^7.0", -# "justinrainbow/json-schema": "^1.6 || ^2.0", +# "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0", # "composer/ca-bundle": "^1.0", # "composer/semver": "^1.0", # "composer/spdx-licenses": "^1.0", # "seld/jsonlint": "~1.4", -# "symfony/console": "^2.5 || ^3.0", -# "symfony/finder": "^2.2 || ^3.0", -# "symfony/process": "^2.1 || ^3.0", -# "symfony/filesystem": "^2.5 || ^3.0", +# "symfony/console": "^2.7 || ^3.0", +# "symfony/finder": "^2.7 || ^3.0", +# "symfony/process": "^2.7 || ^3.0", +# "symfony/filesystem": "^2.7 || ^3.0", # "seld/phar-utils": "^1.0", # "seld/cli-prompt": "^1.0", # "psr/log": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-composer(justinrainbow/json-schema) >= 2.0 -Requires: php-composer(justinrainbow/json-schema) < 3 +Requires: php-composer(justinrainbow/json-schema) < 5 Requires: php-composer(composer/spdx-licenses) >= 1.0 Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/ca-bundle) >= 1.0 @@ -92,13 +92,13 @@ Requires: php-composer(seld/cli-prompt) >= 1.0 Requires: php-composer(seld/cli-prompt) < 2 Requires: php-composer(psr/log) >= 1.0 Requires: php-composer(psr/log) < 2 -Requires: php-composer(symfony/console) >= 2.5 +Requires: php-composer(symfony/console) >= 2.7 Requires: php-composer(symfony/console) < 4 -Requires: php-composer(symfony/finder) >= 2.2 +Requires: php-composer(symfony/finder) >= 2.7 Requires: php-composer(symfony/finder) < 4 -Requires: php-composer(symfony/process) >= 2.1 +Requires: php-composer(symfony/process) >= 2.7 Requires: php-composer(symfony/process) < 4 -Requires: php-composer(symfony/filesystem) >= 2.5 +Requires: php-composer(symfony/filesystem) >= 2.7 Requires: php-composer(symfony/filesystem) < 4 # From composer.json, suggest # "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic", @@ -237,6 +237,11 @@ export BUILDROOT=%{buildroot} %changelog +* Sat Dec 24 2016 Remi Collet - 1.3.0-1 +- update to 1.3.0 +- raise dependency on symfony 2.7 +- allow justinrainbow/json-schema 4 + * Wed Dec 7 2016 Remi Collet - 1.2.4-1 - update to 1.2.4 diff --git a/sources b/sources index 766e476..466277d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c99da49027f8666de6919d03eed74978 composer-1.2.4-7895e4a.tar.gz +SHA512 (composer-1.3.0-e53f9e5.tar.gz) = 9c5707e63fba679a0db23e61074642d23c0b4620568a9ecf0154cb7d6d1fa1364bf2826afffb26ccd90012f6086b464be13f5cc27a333b9cffbf9d245448d254 From 7a33b073e5da584bd14fab1d78e39ff83a89e98f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 24 Dec 2016 09:18:55 +0100 Subject: [PATCH 22/73] drop online tests (cherry picked from commit c0933d50adeda6469a5ee5d651503015f021e86d) --- composer.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/composer.spec b/composer.spec index 8b23892..6e1738a 100644 --- a/composer.spec +++ b/composer.spec @@ -208,11 +208,8 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} %check %if %{with_tests} -%if 0%{?rhel} == 5 -rm tests/Composer/Test/Downloader/XzDownloaderTest.php -%endif -sed -e 's/testDispatcherCanConvertScriptEventToCommandEventForListener/SKIP1/' \ - -i tests/Composer/Test/EventDispatcher/EventDispatcherTest.php +: Online tests +rm tests/Composer/Test/Util/RemoteFilesystemTest.php : Ensure not used rm -rf res From 10e94d13ab1a7e90bdde770a7351491468a78077 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 7 Jan 2017 19:27:08 +0100 Subject: [PATCH 23/73] v1.3.1 (cherry picked from commit eca3faa17165c31e98d0a0c2529cb559c16652e8) --- .gitignore | 1 + composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5248737..9966479 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clog /composer-1.3.0-e53f9e5.tar.gz +/composer-1.3.1-91dbca5.tar.gz diff --git a/composer.spec b/composer.spec index 6e1738a..a059610 100644 --- a/composer.spec +++ b/composer.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2016 Remi Collet +# Copyright (c) 2015-2017 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit e53f9e5381e70f76e098136343e27d92601eade7 +%global gh_commit 91dbca556764dcece45e1ba3aab14de2deaa9fec %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.3.0 +Version: 1.3.1 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot} %changelog +* Sat Jan 7 2017 Remi Collet - 1.3.1-1 +- update to 1.3.1 + * Sat Dec 24 2016 Remi Collet - 1.3.0-1 - update to 1.3.0 - raise dependency on symfony 2.7 diff --git a/sources b/sources index 466277d..be852ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.3.0-e53f9e5.tar.gz) = 9c5707e63fba679a0db23e61074642d23c0b4620568a9ecf0154cb7d6d1fa1364bf2826afffb26ccd90012f6086b464be13f5cc27a333b9cffbf9d245448d254 +SHA512 (composer-1.3.1-91dbca5.tar.gz) = 8a91f391fdbf3601b81a4531b041755612fe282c10a8839ab82c6f49493e08c6a9b0b298a459b1e92be2df1456fe0bc2ae931dfe6184e9c20b25a37a75810de8 From b0b7b563f314e4f571dde876a6afabf5b3ef7e3b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 28 Jan 2017 06:24:40 +0100 Subject: [PATCH 24/73] v1.3.2 --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9966479..ddf30aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /composer-1.3.0-e53f9e5.tar.gz /composer-1.3.1-91dbca5.tar.gz +/composer-1.3.2-e7569ed.tar.gz diff --git a/composer.spec b/composer.spec index a059610..481e2a0 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 91dbca556764dcece45e1ba3aab14de2deaa9fec +%global gh_commit e7569edb4a5eadcbb2e4ad5ed753282260f281df %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.3.1 +Version: 1.3.2 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot} %changelog +* Sat Jan 28 2017 Remi Collet - 1.3.2-1 +- update to 1.3.2 + * Sat Jan 7 2017 Remi Collet - 1.3.1-1 - update to 1.3.1 diff --git a/sources b/sources index be852ce..8f84b8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.3.1-91dbca5.tar.gz) = 8a91f391fdbf3601b81a4531b041755612fe282c10a8839ab82c6f49493e08c6a9b0b298a459b1e92be2df1456fe0bc2ae931dfe6184e9c20b25a37a75810de8 +SHA512 (composer-1.3.2-e7569ed.tar.gz) = f8d0a1331339ac87e6f04939d234761dd3624732bb14271f9989ea143a6393ce60ce3e9a4d0d9004474ebcd350a838170ff28236716da1c7a0020020913d063f From 651cf5faf17e68386034d978a2b8b07fe8547d62 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Mar 2017 13:06:35 +0100 Subject: [PATCH 25/73] v1.3.3 (cherry picked from commit 030be2f9ed447ea3e886970a181961911a9f46d5) (cherry picked from commit e1d773c231b2dbeb36a0526cc233459555836aee) --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ddf30aa..668baf2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /composer-1.3.0-e53f9e5.tar.gz /composer-1.3.1-91dbca5.tar.gz /composer-1.3.2-e7569ed.tar.gz +/composer-1.3.3-989d687.tar.gz diff --git a/composer.spec b/composer.spec index 481e2a0..0b56359 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit e7569edb4a5eadcbb2e4ad5ed753282260f281df +%global gh_commit 989d68725bc8ebf97e795d4feb386f52adb096e3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot} %changelog +* Wed Mar 8 2017 Remi Collet - 1.3.3-1 +- Update to 1.3.3 + * Sat Jan 28 2017 Remi Collet - 1.3.2-1 - update to 1.3.2 diff --git a/sources b/sources index 8f84b8a..7f3a0a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.3.2-e7569ed.tar.gz) = f8d0a1331339ac87e6f04939d234761dd3624732bb14271f9989ea143a6393ce60ce3e9a4d0d9004474ebcd350a838170ff28236716da1c7a0020020913d063f +SHA512 (composer-1.3.3-989d687.tar.gz) = 343706f1df3145ba17af518efd504b531b9a55fcc39151e1764e92b8845d6990a171494e9ad155c7201bc6ed1ec50b91301941bfb875dfd9ce8a30d39bb8091a From 4c52ab5d417a74c4fdc0f5c5b3f198a1f255d63d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Mar 2017 06:51:17 +0100 Subject: [PATCH 26/73] Update to 1.4.0 raise dependency on justinrainbow/json-schema version 3 to 5 (cherry picked from commit aa6ca2cfd10265225caa5208debd46418fe232a5) --- .gitignore | 1 + composer-autoload.php | 2 +- composer-rpm.patch | 35 ++++++++++++++++++----------------- composer.spec | 16 ++++++++++------ sources | 2 +- 5 files changed, 31 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 668baf2..57da520 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /composer-1.3.1-91dbca5.tar.gz /composer-1.3.2-e7569ed.tar.gz /composer-1.3.3-989d687.tar.gz +/composer-1.4.0-b19655f.tar.gz diff --git a/composer-autoload.php b/composer-autoload.php index e36e932..f66b4f8 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -17,7 +17,7 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; $vendorDir . '/Composer/Semver/autoload.php', $vendorDir . '/Psr/Log/autoload.php', array( + $vendorDir . '/JsonSchema5/autoload.php', $vendorDir . '/JsonSchema4/autoload.php', - $vendorDir . '/JsonSchema2/autoload.php', ))); diff --git a/composer-rpm.patch b/composer-rpm.patch index 1cdfd7d..9b896a2 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2016-12-12 10:30:58.174009561 +0100 -+++ ./bin/composer 2016-12-12 10:32:17.465427241 +0100 +--- ./bin/composer.rpm 2017-03-08 17:51:24.000000000 +0100 ++++ ./bin/composer 2017-03-08 19:16:24.206124958 +0100 @@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') { echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL; } @@ -11,8 +11,8 @@ diff -up ./bin/composer.rpm ./bin/composer use Composer\Factory; use Composer\XdebugHandler; diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php ---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2016-12-11 17:04:50.000000000 +0100 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2016-12-12 10:30:58.175009567 +0100 +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2017-03-08 17:51:24.000000000 +0100 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2017-03-08 19:16:24.207124963 +0100 @@ -305,7 +305,7 @@ EOF; file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion)); @@ -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 2016-12-11 17:04:50.000000000 +0100 -+++ ./src/Composer/Compiler.php 2016-12-12 10:30:58.175009567 +0100 +--- ./src/Composer/Compiler.php.rpm 2017-03-08 17:51:24.000000000 +0100 ++++ ./src/Composer/Compiler.php 2017-03-08 19:16:24.207124963 +0100 @@ -97,7 +97,7 @@ class Compiler $finder = new Finder(); $finder->files() @@ -35,26 +35,27 @@ 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 2016-12-11 17:04:50.000000000 +0100 -+++ ./src/Composer/Json/JsonFile.php 2016-12-12 10:30:58.175009567 +0100 +--- ./src/Composer/Json/JsonFile.php.rpm 2017-03-08 19:16:24.207124963 +0100 ++++ ./src/Composer/Json/JsonFile.php 2017-03-08 19:17:35.148449586 +0100 @@ -156,7 +156,7 @@ class JsonFile self::validateSyntax($content, $this->path); } - $schemaFile = __DIR__ . '/../../../res/composer-schema.json'; + $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'; - $schemaData = json_decode(file_get_contents($schemaFile)); - if ($schema === self::LAX_SCHEMA) { + // 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 2016-12-11 17:04:50.000000000 +0100 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-12-12 10:30:58.175009567 +0100 -@@ -95,7 +95,7 @@ class ComposerSchemaTest extends \PHPUni - +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2017-03-08 19:16:24.207124963 +0100 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2017-03-08 19:19:02.243848127 +0100 +@@ -96,7 +96,8 @@ class ComposerSchemaTest extends \PHPUni private function check($json) { -- $schema = json_decode(file_get_contents(__DIR__ . '/../../../../res/composer-schema.json')); -+ $schema = json_decode(file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json')); $validator = new Validator(); - $validator->check(json_decode($json), $schema); +- $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json')); ++ $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'; ++ $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f)); + if (!$validator->isValid()) { + $errors = $validator->getErrors(); diff --git a/composer.spec b/composer.spec index 0b56359..f84c2f7 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 989d68725bc8ebf97e795d4feb386f52adb096e3 +%global gh_commit b19655f1304a3365213204bcf9a9b84476d0d265 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.3.3 +Version: 1.4.0 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -36,7 +36,7 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php-cli %if %{with_tests} -BuildRequires: php-composer(justinrainbow/json-schema) >= 2.0 +BuildRequires: php-composer(justinrainbow/json-schema) >= 3.0 BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 BuildRequires: php-composer(composer/ca-bundle) >= 1.0 BuildRequires: php-composer(composer/semver) >= 1.0 @@ -62,7 +62,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # From composer.json, "require": { # "php": "^5.3.2 || ^7.0", -# "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0", +# "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", # "composer/ca-bundle": "^1.0", # "composer/semver": "^1.0", # "composer/spdx-licenses": "^1.0", @@ -76,8 +76,8 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # "psr/log": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli -Requires: php-composer(justinrainbow/json-schema) >= 2.0 -Requires: php-composer(justinrainbow/json-schema) < 5 +Requires: php-composer(justinrainbow/json-schema) >= 3.0 +Requires: php-composer(justinrainbow/json-schema) < 6 Requires: php-composer(composer/spdx-licenses) >= 1.0 Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/ca-bundle) >= 1.0 @@ -234,6 +234,10 @@ export BUILDROOT=%{buildroot} %changelog +* Wed Mar 8 2017 Remi Collet - 1.4.0-1 +- Update to 1.4.0 +- raise dependency on justinrainbow/json-schema version 3 to 5 + * Wed Mar 8 2017 Remi Collet - 1.3.3-1 - Update to 1.3.3 diff --git a/sources b/sources index 7f3a0a4..d5af73c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.3.3-989d687.tar.gz) = 343706f1df3145ba17af518efd504b531b9a55fcc39151e1764e92b8845d6990a171494e9ad155c7201bc6ed1ec50b91301941bfb875dfd9ce8a30d39bb8091a +SHA512 (composer-1.4.0-b19655f.tar.gz) = be4f877a8e6b744eb6b09e7dcf7963f36de0e5a4adcbfa94e12ad201d336342faa511e1afa6e70660c43ef70915c89211893d3949c8c4d27f688d910ca2b8434 From 0bdf966426d2501a39cbac067d3af5bce46fc1eb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Mar 2017 10:19:44 +0100 Subject: [PATCH 27/73] v1.4.1 (cherry picked from commit a7afdca0fe3206f7d9704fe1e9c5b41b4b486213) --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 57da520..5c361b2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /composer-1.3.2-e7569ed.tar.gz /composer-1.3.3-989d687.tar.gz /composer-1.4.0-b19655f.tar.gz +/composer-1.4.1-7ee2a5e.tar.gz diff --git a/composer.spec b/composer.spec index f84c2f7..72e7df0 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit b19655f1304a3365213204bcf9a9b84476d0d265 +%global gh_commit 7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -234,6 +234,9 @@ export BUILDROOT=%{buildroot} %changelog +* Fri Mar 10 2017 Remi Collet - 1.4.1-1 +- Update to 1.4.1 + * Wed Mar 8 2017 Remi Collet - 1.4.0-1 - Update to 1.4.0 - raise dependency on justinrainbow/json-schema version 3 to 5 diff --git a/sources b/sources index d5af73c..138a0ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.4.0-b19655f.tar.gz) = be4f877a8e6b744eb6b09e7dcf7963f36de0e5a4adcbfa94e12ad201d336342faa511e1afa6e70660c43ef70915c89211893d3949c8c4d27f688d910ca2b8434 +SHA512 (composer-1.4.1-7ee2a5e.tar.gz) = b32670254e3a06530a30362bc67e6c17f4badc75a0ac571ec917ae6acaef263bd1ae95421440ba43418326b3a38dc8fa1192f8be52a930711a1cf8a88e72364e From 232b85a67434de9d5b761d63e8e0219d67f3dc55 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 May 2017 09:52:48 +0200 Subject: [PATCH 28/73] Update to 1.4.2 fix autoloader to allow symfony 2 and 3 raise dependency on justinrainbow/json-schema v5 open https://github.com/composer/composer/pull/6435 - fix tests (cherry picked from commit 1e95d671fb383cdc96d877b54ef1f2fa72656564) --- .gitignore | 1 + composer-autoload.php | 23 ++++++++++++++----- composer-pr6435.patch | 52 +++++++++++++++++++++++++++++++++++++++++++ composer.spec | 51 ++++++++++++++++++++++++++++++++---------- sources | 2 +- 5 files changed, 111 insertions(+), 18 deletions(-) create mode 100644 composer-pr6435.patch diff --git a/.gitignore b/.gitignore index 5c361b2..54c5d37 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /composer-1.3.3-989d687.tar.gz /composer-1.4.0-b19655f.tar.gz /composer-1.4.1-7ee2a5e.tar.gz +/composer-1.4.2-489e09e.tar.gz diff --git a/composer-autoload.php b/composer-autoload.php index f66b4f8..f1f20ac 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -8,7 +8,22 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; // Dependencies \Fedora\Autoloader\Dependencies::required(array( - $vendorDir . '/Symfony/Component/autoload.php', + array( + $vendorDir . '/Symfony3/Component/Console/autoload.php', + $vendorDir . '/Symfony/Component/Console/autoload.php', + ), + array( + $vendorDir . '/Symfony3/Component/Finder/autoload.php', + $vendorDir . '/Symfony/Component/Finder/autoload.php', + ), + array( + $vendorDir . '/Symfony3/Component/Process/autoload.php', + $vendorDir . '/Symfony/Component/Process/autoload.php', + ), + array( + $vendorDir . '/Symfony3/Component/Filesystem/autoload.php', + $vendorDir . '/Symfony/Component/Filesystem/autoload.php', + ), $vendorDir . '/Seld/JsonLint/autoload.php', $vendorDir . '/Seld/PharUtils/autoload.php', $vendorDir . '/Seld/CliPrompt/autoload.php', @@ -16,8 +31,6 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; $vendorDir . '/Composer/Spdx/autoload.php', $vendorDir . '/Composer/Semver/autoload.php', $vendorDir . '/Psr/Log/autoload.php', - array( - $vendorDir . '/JsonSchema5/autoload.php', - $vendorDir . '/JsonSchema4/autoload.php', -))); + $vendorDir . '/JsonSchema5/autoload.php', +)); diff --git a/composer-pr6435.patch b/composer-pr6435.patch new file mode 100644 index 0000000..71792a9 --- /dev/null +++ b/composer-pr6435.patch @@ -0,0 +1,52 @@ +From 95d82f6fde2795c7193cf4ad15fc71d279989842 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 22 May 2017 08:01:51 +0200 +Subject: [PATCH 1/2] fix test for json-schema 5.2 + +--- + tests/Composer/Test/Json/ComposerSchemaTest.php | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/Composer/Test/Json/ComposerSchemaTest.php b/tests/Composer/Test/Json/ComposerSchemaTest.php +index 5ab623d02b6e..41e0cccb4f26 100644 +--- a/tests/Composer/Test/Json/ComposerSchemaTest.php ++++ b/tests/Composer/Test/Json/ComposerSchemaTest.php +@@ -101,9 +101,10 @@ private function check($json) + if (!$validator->isValid()) { + $errors = $validator->getErrors(); + +- // remove justinrainbow/json-schema 3.0 props so it works with all versions ++ // remove justinrainbow/json-schema 3.0/5.2 props so it works with all versions + foreach ($errors as &$err) { + unset($err['pointer']); ++ unset($err['context']); + } + + return $errors; + +From 741c8d63fbad0253a53b9558d98ee95b42fdbefc Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 22 May 2017 08:16:45 +0200 +Subject: [PATCH 2/2] fix test for Symfony 3.2 + +--- + tests/Composer/Test/IO/ConsoleIOTest.php | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tests/Composer/Test/IO/ConsoleIOTest.php b/tests/Composer/Test/IO/ConsoleIOTest.php +index ace27a416f53..ff96a011fc0c 100644 +--- a/tests/Composer/Test/IO/ConsoleIOTest.php ++++ b/tests/Composer/Test/IO/ConsoleIOTest.php +@@ -218,8 +218,11 @@ public function testAskAndValidate() + ->will($this->returnValue($helperMock)) + ; + ++ $validator = function ($value) { ++ return true; ++ }; + $consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock); +- $consoleIO->askAndValidate('Why?', 'validator', 10, 'default'); ++ $consoleIO->askAndValidate('Why?', $validator, 10, 'default'); + } + + public function testSelect() diff --git a/composer.spec b/composer.spec index 72e7df0..36d78fa 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 7ee2a5e1cf32e9c8439445fe8dce2c046c2abebd +%global gh_commit 489e09ee6c3ba431fbeeef9147afdaeb6f91b647 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,8 +16,8 @@ #global prever RC Name: composer -Version: 1.4.1 -Release: 1%{?dist} +Version: 1.4.2 +Release: 2%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -33,21 +33,36 @@ Source4: %{name}.csh # Use our autoloader, resources path, fix for tests Patch0: %{name}-rpm.patch +# https://github.com/composer/composer/issues/6434 +# https://github.com/composer/composer/pull/6435 +Patch1: %{name}-pr6435.patch + BuildArch: noarch BuildRequires: php-cli %if %{with_tests} -BuildRequires: php-composer(justinrainbow/json-schema) >= 3.0 +BuildRequires: php-justinrainbow-json-schema5 +BuildRequires: php-composer(composer/spdx-licenses) < 2 BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 +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(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(seld/cli-prompt) < 2 BuildRequires: php-composer(seld/cli-prompt) >= 1.0 +BuildRequires: php-composer(psr/log) < 2 BuildRequires: php-composer(psr/log) >= 1.0 -BuildRequires: php-composer(symfony/console) >= 2.5 -BuildRequires: php-composer(symfony/finder) >= 2.2 -BuildRequires: php-composer(symfony/filesystem) >= 2.5 -BuildRequires: php-composer(symfony/process) >= 2.1 +BuildRequires: php-composer(symfony/console) < 4 +BuildRequires: php-composer(symfony/console) >= 2.7 +BuildRequires: php-composer(symfony/finder) < 4 +BuildRequires: php-composer(symfony/finder) >= 2.7 +BuildRequires: php-composer(symfony/filesystem) < 4 +BuildRequires: php-composer(symfony/filesystem) >= 2.7 +BuildRequires: php-composer(symfony/process) < 4 +BuildRequires: php-composer(symfony/process) >= 2.7 BuildRequires: php-zip # From composer.json, "require-dev": { # "phpunit/phpunit": "^4.5 || ^5.0.5", @@ -76,8 +91,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # "psr/log": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli -Requires: php-composer(justinrainbow/json-schema) >= 3.0 -Requires: php-composer(justinrainbow/json-schema) < 6 +Requires: php-justinrainbow-json-schema5 Requires: php-composer(composer/spdx-licenses) >= 1.0 Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/ca-bundle) >= 1.0 @@ -148,6 +162,7 @@ Documentation: https://getcomposer.org/doc/ %patch0 -p1 -b .rpm find . -name \*.rpm -exec rm {} \; -print +%patch1 -p1 -b .pr6435 if grep -r '\.\./res'; then : Patch need to fixed @@ -186,7 +201,6 @@ if (version_compare(PluginInterface::PLUGIN_API_VERSION, "%{api_version}")) { %install - : Profile scripts mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/ @@ -216,7 +230,14 @@ rm -rf res : Run test suite export BUILDROOT=%{buildroot} -%{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose + +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 + fi +done +exit $ret %else : Test suite disabled %endif @@ -234,6 +255,12 @@ export BUILDROOT=%{buildroot} %changelog +* Mon May 22 2017 Remi Collet - 1.4.2-2 +- Update to 1.4.2 +- fix autoloader to allow symfony 2 and 3 +- raise dependency on justinrainbow/json-schema v5 +- open https://github.com/composer/composer/pull/6435 - fix tests + * Fri Mar 10 2017 Remi Collet - 1.4.1-1 - Update to 1.4.1 diff --git a/sources b/sources index 138a0ee..0d3519b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.4.1-7ee2a5e.tar.gz) = b32670254e3a06530a30362bc67e6c17f4badc75a0ac571ec917ae6acaef263bd1ae95421440ba43418326b3a38dc8fa1192f8be52a930711a1cf8a88e72364e +SHA512 (composer-1.4.2-489e09e.tar.gz) = c6fc0aeccc10e67263f939c930850ad8ef705b7cbb52485f683d2c8c9021eecbd89268e7977d779bc4899ec10ff50f2315d0b3d6e45c26a73c59842c3c5d8930 From ef6cb0a4f6586465a34430aced25468e369b12b2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Aug 2017 07:33:51 +0200 Subject: [PATCH 29/73] Update to 1.4.3 ignore 2 failed tests related to BC break in symfony (cherry picked from commit d7ea71dd270c88094c93c8d0bf1af1ae06446fc7) (cherry picked from commit 0ea11208a9b3f7c4989553432898507295db4046) --- .gitignore | 1 + composer-pr6435.patch | 52 ------------------------------------------- composer.spec | 20 ++++++++++------- sources | 2 +- 4 files changed, 14 insertions(+), 61 deletions(-) delete mode 100644 composer-pr6435.patch diff --git a/.gitignore b/.gitignore index 54c5d37..1173984 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /composer-1.4.0-b19655f.tar.gz /composer-1.4.1-7ee2a5e.tar.gz /composer-1.4.2-489e09e.tar.gz +/composer-1.4.3-62c17fd.tar.gz diff --git a/composer-pr6435.patch b/composer-pr6435.patch deleted file mode 100644 index 71792a9..0000000 --- a/composer-pr6435.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 95d82f6fde2795c7193cf4ad15fc71d279989842 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 22 May 2017 08:01:51 +0200 -Subject: [PATCH 1/2] fix test for json-schema 5.2 - ---- - tests/Composer/Test/Json/ComposerSchemaTest.php | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/Composer/Test/Json/ComposerSchemaTest.php b/tests/Composer/Test/Json/ComposerSchemaTest.php -index 5ab623d02b6e..41e0cccb4f26 100644 ---- a/tests/Composer/Test/Json/ComposerSchemaTest.php -+++ b/tests/Composer/Test/Json/ComposerSchemaTest.php -@@ -101,9 +101,10 @@ private function check($json) - if (!$validator->isValid()) { - $errors = $validator->getErrors(); - -- // remove justinrainbow/json-schema 3.0 props so it works with all versions -+ // remove justinrainbow/json-schema 3.0/5.2 props so it works with all versions - foreach ($errors as &$err) { - unset($err['pointer']); -+ unset($err['context']); - } - - return $errors; - -From 741c8d63fbad0253a53b9558d98ee95b42fdbefc Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 22 May 2017 08:16:45 +0200 -Subject: [PATCH 2/2] fix test for Symfony 3.2 - ---- - tests/Composer/Test/IO/ConsoleIOTest.php | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tests/Composer/Test/IO/ConsoleIOTest.php b/tests/Composer/Test/IO/ConsoleIOTest.php -index ace27a416f53..ff96a011fc0c 100644 ---- a/tests/Composer/Test/IO/ConsoleIOTest.php -+++ b/tests/Composer/Test/IO/ConsoleIOTest.php -@@ -218,8 +218,11 @@ public function testAskAndValidate() - ->will($this->returnValue($helperMock)) - ; - -+ $validator = function ($value) { -+ return true; -+ }; - $consoleIO = new ConsoleIO($inputMock, $outputMock, $setMock); -- $consoleIO->askAndValidate('Why?', 'validator', 10, 'default'); -+ $consoleIO->askAndValidate('Why?', $validator, 10, 'default'); - } - - public function testSelect() diff --git a/composer.spec b/composer.spec index 36d78fa..ed33861 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 489e09ee6c3ba431fbeeef9147afdaeb6f91b647 +%global gh_commit 62c17fdf79a1f7f42778aed376da9c8cb03e5f62 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,8 +16,8 @@ #global prever RC Name: composer -Version: 1.4.2 -Release: 2%{?dist} +Version: 1.4.3 +Release: 1%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -33,10 +33,6 @@ Source4: %{name}.csh # Use our autoloader, resources path, fix for tests Patch0: %{name}-rpm.patch -# https://github.com/composer/composer/issues/6434 -# https://github.com/composer/composer/pull/6435 -Patch1: %{name}-pr6435.patch - BuildArch: noarch BuildRequires: php-cli %if %{with_tests} @@ -162,7 +158,6 @@ Documentation: https://getcomposer.org/doc/ %patch0 -p1 -b .rpm find . -name \*.rpm -exec rm {} \; -print -%patch1 -p1 -b .pr6435 if grep -r '\.\./res'; then : Patch need to fixed @@ -225,6 +220,11 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} : Online tests rm tests/Composer/Test/Util/RemoteFilesystemTest.php +: Known to fail - regression in recent symfony version +sed -e 's/testDevWarningPrevented/SKIP_testDevWarningPrevented/' \ + -e 's/testDevWarningPreventedAlias/SKIP_testDevWarningPreventedAlias/' \ + -i tests/Composer/Test/ApplicationTest.php + : Ensure not used rm -rf res @@ -255,6 +255,10 @@ exit $ret %changelog +* Mon Aug 7 2017 Remi Collet - 1.4.3-1 +- Update to 1.4.3 +- ignore 2 failed tests related to BC break in symfony + * Mon May 22 2017 Remi Collet - 1.4.2-2 - Update to 1.4.2 - fix autoloader to allow symfony 2 and 3 diff --git a/sources b/sources index 0d3519b..538a849 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.4.2-489e09e.tar.gz) = c6fc0aeccc10e67263f939c930850ad8ef705b7cbb52485f683d2c8c9021eecbd89268e7977d779bc4899ec10ff50f2315d0b3d6e45c26a73c59842c3c5d8930 +SHA512 (composer-1.4.3-62c17fd.tar.gz) = dbf646fe6fb43cd4bf6e241a1f657ba8f2f07223283c86b6dcf52352e0219f49925e5ae5ef509bffc610c4e1e368ca6afd4f85b334ee4b1de2362ce59746bb46 From 3c9a5e0de009b273cc51be2ded3d76eca81cc4d0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 8 Aug 2017 12:04:07 +0200 Subject: [PATCH 30/73] v1.5.0 (cherry picked from commit 3bfaceb3ada4c265dbb3853993431827b5298bd0) --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1173984..e1ddb84 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /composer-1.4.1-7ee2a5e.tar.gz /composer-1.4.2-489e09e.tar.gz /composer-1.4.3-62c17fd.tar.gz +/composer-1.5.0-6f3310c.tar.gz diff --git a/composer.spec b/composer.spec index ed33861..5a9c63b 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 62c17fdf79a1f7f42778aed376da9c8cb03e5f62 +%global gh_commit 6f3310c762b658bca64e060262ea2b1d4a1ec4b0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.4.3 +Version: 1.5.0 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -255,6 +255,9 @@ exit $ret %changelog +* Tue Aug 8 2017 Remi Collet - 1.5.0-1 +- Update to 1.5.0 + * Mon Aug 7 2017 Remi Collet - 1.4.3-1 - Update to 1.4.3 - ignore 2 failed tests related to BC break in symfony diff --git a/sources b/sources index 538a849..df09220 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.4.3-62c17fd.tar.gz) = dbf646fe6fb43cd4bf6e241a1f657ba8f2f07223283c86b6dcf52352e0219f49925e5ae5ef509bffc610c4e1e368ca6afd4f85b334ee4b1de2362ce59746bb46 +SHA512 (composer-1.5.0-6f3310c.tar.gz) = 1a3c87538ffd51c74aeadd9b285fd488702d4d2678ab8267e218f98a5782c2888d0f1c90bcf0b3f538b15a97b2e22f63ae236db6efb25c5c2e790d9e608f4d19 From 59cf0c360c6ae68ebef0da1d23b32076138c803f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Aug 2017 17:21:43 +0200 Subject: [PATCH 31/73] v1.5.1 (cherry picked from commit e7579fdddc52b085b441454d24b2467c2eb16bb9) --- .gitignore | 1 + composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e1ddb84..7c4c942 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /composer-1.4.2-489e09e.tar.gz /composer-1.4.3-62c17fd.tar.gz /composer-1.5.0-6f3310c.tar.gz +/composer-1.5.1-d60a1ff.tar.gz diff --git a/composer.spec b/composer.spec index 5a9c63b..7890d61 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 6f3310c762b658bca64e060262ea2b1d4a1ec4b0 +%global gh_commit d60a1ff0cb421fcd2811c3f2b57f7e3e2b6c9d0e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.5.0 +Version: 1.5.1 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -232,7 +232,7 @@ rm -rf res export BUILDROOT=%{buildroot} ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php56 php70 php71 php72 php; do if which $cmd; then $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 fi @@ -255,6 +255,9 @@ exit $ret %changelog +* Wed Aug 9 2017 Remi Collet - 1.5.1-1 +- Update to 1.5.1 + * Tue Aug 8 2017 Remi Collet - 1.5.0-1 - Update to 1.5.0 diff --git a/sources b/sources index df09220..bf90da1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.5.0-6f3310c.tar.gz) = 1a3c87538ffd51c74aeadd9b285fd488702d4d2678ab8267e218f98a5782c2888d0f1c90bcf0b3f538b15a97b2e22f63ae236db6efb25c5c2e790d9e608f4d19 +SHA512 (composer-1.5.1-d60a1ff.tar.gz) = 36470e017a900c33a3fa6f76e9da85f31a34f5d9e82399c8f735204f84aac685c60d91d02b22e1a3c8490178ac58d958c317c1a05ecb034bda87cab2005b866b From b044712eeacd14be84a5c6aecba87fa97055d0ab Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Sep 2017 07:29:53 +0200 Subject: [PATCH 32/73] v1.5.2 (cherry picked from commit 3810b647e32b9293d8f95d33d9a201a814fa3ff3) --- .gitignore | 1 + composer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7c4c942..9711caf 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /composer-1.4.3-62c17fd.tar.gz /composer-1.5.0-6f3310c.tar.gz /composer-1.5.1-d60a1ff.tar.gz +/composer-1.5.2-c639623.tar.gz diff --git a/composer.spec b/composer.spec index 7890d61..8c4f956 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit d60a1ff0cb421fcd2811c3f2b57f7e3e2b6c9d0e +%global gh_commit c639623fa2178b404ed4bab80f0d1263853fa4ae %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.5.1 +Version: 1.5.2 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -232,7 +232,7 @@ rm -rf res export BUILDROOT=%{buildroot} ret=0 -for cmd in php56 php70 php71 php72 php; do +for cmd in php php56 php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 fi @@ -255,6 +255,9 @@ exit $ret %changelog +* Mon Sep 11 2017 Remi Collet - 1.5.2-1 +- Update to 1.5.2 + * Wed Aug 9 2017 Remi Collet - 1.5.1-1 - Update to 1.5.1 diff --git a/sources b/sources index bf90da1..e24e280 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.5.1-d60a1ff.tar.gz) = 36470e017a900c33a3fa6f76e9da85f31a34f5d9e82399c8f735204f84aac685c60d91d02b22e1a3c8490178ac58d958c317c1a05ecb034bda87cab2005b866b +SHA512 (composer-1.5.2-c639623.tar.gz) = 03b7dfb319b8457cf69589fd116c73169e9a044c8fe17624164343586e10c3bd8470c7df45b6a796cba9e9ed6de5ff6c640f7d881661d93fb71dcbe9aa140603 From 772cee62962f2bbb3ed776279b1c25101290e576 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Dec 2017 07:32:24 +0100 Subject: [PATCH 33/73] v1.5.3 (cherry picked from commit 847239d325b2104875171ae3c1baadf942421195) --- .gitignore | 1 + composer.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9711caf..9276982 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /composer-1.5.0-6f3310c.tar.gz /composer-1.5.1-d60a1ff.tar.gz /composer-1.5.2-c639623.tar.gz +/composer-1.5.3-de0c4af.tar.gz diff --git a/composer.spec b/composer.spec index 8c4f956..933adf4 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit c639623fa2178b404ed4bab80f0d1263853fa4ae +%global gh_commit de0c4afd4aeb08171b54b64e63aa61a04b4510ee %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.5.2 +Version: 1.5.3 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -231,10 +231,13 @@ rm -rf res : Run test suite export BUILDROOT=%{buildroot} +# testIntegration may hang on local build ret=0 for cmd in php php56 php70 php71 php72; do if which $cmd; then - $cmd %{_bindir}/phpunit --include-path %{buildroot}%{_datadir}/php --verbose || ret=1 + $cmd -d memory_limit=1G %{_bindir}/phpunit \ + --filter '^((?!(testIntegration)).)*$' \ + --include-path %{buildroot}%{_datadir}/php || ret=1 fi done exit $ret @@ -255,6 +258,9 @@ exit $ret %changelog +* Fri Dec 1 2017 Remi Collet - 1.5.3-1 +- Update to 1.5.3 + * Mon Sep 11 2017 Remi Collet - 1.5.2-1 - Update to 1.5.2 diff --git a/sources b/sources index e24e280..8a33ea2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.5.2-c639623.tar.gz) = 03b7dfb319b8457cf69589fd116c73169e9a044c8fe17624164343586e10c3bd8470c7df45b6a796cba9e9ed6de5ff6c640f7d881661d93fb71dcbe9aa140603 +SHA512 (composer-1.5.3-de0c4af.tar.gz) = f97ba5e1eed9f1e270ae9633f56a2c28e5dc1175f4a9acdaf88336c3d83b4361b2f1dabed34b6a2aa2dda617caa0231c67c108f0c7294af24a6d6a810c99e48e From 88431526e11fc91f67f090411bde4e9ad75187cf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Dec 2017 12:17:07 +0100 Subject: [PATCH 34/73] v1.5.4 (cherry picked from commit 35740d006364effd447a107b739eb4879482573f) --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9276982..b3495e4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /composer-1.5.1-d60a1ff.tar.gz /composer-1.5.2-c639623.tar.gz /composer-1.5.3-de0c4af.tar.gz +/composer-1.5.4-73aa733.tar.gz diff --git a/composer.spec b/composer.spec index 933adf4..8280cd3 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit de0c4afd4aeb08171b54b64e63aa61a04b4510ee +%global gh_commit 73aa733d2a64afa4713814965e56ee70bf725829 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.5.3 +Version: 1.5.4 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -258,6 +258,9 @@ exit $ret %changelog +* Fri Dec 1 2017 Remi Collet - 1.5.4-1 +- Update to 1.5.4 + * Fri Dec 1 2017 Remi Collet - 1.5.3-1 - Update to 1.5.3 diff --git a/sources b/sources index 8a33ea2..24c8d7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.5.3-de0c4af.tar.gz) = f97ba5e1eed9f1e270ae9633f56a2c28e5dc1175f4a9acdaf88336c3d83b4361b2f1dabed34b6a2aa2dda617caa0231c67c108f0c7294af24a6d6a810c99e48e +SHA512 (composer-1.5.4-73aa733.tar.gz) = 8345319117726a7cebb7f4ae295867a8a6e2c4003449e90484462a74cc5800c233b1c4fd7b953e0420fadde480c010dedf0cb95e1de8b3a379254ff3eda77e9a From d66b2cc1e3c1ff1de3e001eea0af64dbe6c5d183 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Dec 2017 15:26:40 +0100 Subject: [PATCH 35/73] v1.5.5 (cherry picked from commit 15831db03c7a692f74de2989f2e956439f9432ba) --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b3495e4..3702a2d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /composer-1.5.2-c639623.tar.gz /composer-1.5.3-de0c4af.tar.gz /composer-1.5.4-73aa733.tar.gz +/composer-1.5.5-aab6229.tar.gz diff --git a/composer.spec b/composer.spec index 8280cd3..bfa57c2 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 73aa733d2a64afa4713814965e56ee70bf725829 +%global gh_commit aab6229c9a4b6731f23b36107c39f4007c290b50 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -16,7 +16,7 @@ #global prever RC Name: composer -Version: 1.5.4 +Version: 1.5.5 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -258,6 +258,9 @@ exit $ret %changelog +* Fri Dec 1 2017 Remi Collet - 1.5.5-1 +- Update to 1.5.5 + * Fri Dec 1 2017 Remi Collet - 1.5.4-1 - Update to 1.5.4 diff --git a/sources b/sources index 24c8d7d..0ed945d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.5.4-73aa733.tar.gz) = 8345319117726a7cebb7f4ae295867a8a6e2c4003449e90484462a74cc5800c233b1c4fd7b953e0420fadde480c010dedf0cb95e1de8b3a379254ff3eda77e9a +SHA512 (composer-1.5.5-aab6229.tar.gz) = 29b1e2374412b753ba324436b24fda007434e87cc8ed616f7c31f70efd3ff1024a7b468c8d44285a7e394baa4e4d205c418fe97569731699a06fc06068fbd5aa From 2812b531c6e8f1219240672f15b260d0ce63f544 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Dec 2017 15:27:25 +0100 Subject: [PATCH 36/73] Update to 1.5.6 switch to symfony package names (cherry picked from commit 7d2626d11c68b5256e7c1291add541e2d75f6278) --- .gitignore | 1 + composer.spec | 38 ++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 3702a2d..c926a6b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /composer-1.5.3-de0c4af.tar.gz /composer-1.5.4-73aa733.tar.gz /composer-1.5.5-aab6229.tar.gz +/composer-1.5.6-4f7f9c1.tar.gz diff --git a/composer.spec b/composer.spec index bfa57c2..732e114 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit aab6229c9a4b6731f23b36107c39f4007c290b50 +%global gh_commit 4f7f9c12753ec43f1e4629e2a71cabe81f2a4eab %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -15,8 +15,14 @@ %global api_version 1.1.0 #global prever RC +%if 0%{?fedora} >= 27 +%global symfony_prefix php-symfony3 +%else +%global symfony_prefix php-symfony +%endif + Name: composer -Version: 1.5.5 +Version: 1.5.6 Release: 1%{?dist} Summary: Dependency Manager for PHP @@ -51,14 +57,10 @@ BuildRequires: php-composer(seld/cli-prompt) < 2 BuildRequires: php-composer(seld/cli-prompt) >= 1.0 BuildRequires: php-composer(psr/log) < 2 BuildRequires: php-composer(psr/log) >= 1.0 -BuildRequires: php-composer(symfony/console) < 4 -BuildRequires: php-composer(symfony/console) >= 2.7 -BuildRequires: php-composer(symfony/finder) < 4 -BuildRequires: php-composer(symfony/finder) >= 2.7 -BuildRequires: php-composer(symfony/filesystem) < 4 -BuildRequires: php-composer(symfony/filesystem) >= 2.7 -BuildRequires: php-composer(symfony/process) < 4 -BuildRequires: php-composer(symfony/process) >= 2.7 +BuildRequires: %{symfony_prefix}-console +BuildRequires: %{symfony_prefix}-finder +BuildRequires: %{symfony_prefix}-filesystem +BuildRequires: %{symfony_prefix}-process BuildRequires: php-zip # From composer.json, "require-dev": { # "phpunit/phpunit": "^4.5 || ^5.0.5", @@ -102,14 +104,10 @@ Requires: php-composer(seld/cli-prompt) >= 1.0 Requires: php-composer(seld/cli-prompt) < 2 Requires: php-composer(psr/log) >= 1.0 Requires: php-composer(psr/log) < 2 -Requires: php-composer(symfony/console) >= 2.7 -Requires: php-composer(symfony/console) < 4 -Requires: php-composer(symfony/finder) >= 2.7 -Requires: php-composer(symfony/finder) < 4 -Requires: php-composer(symfony/process) >= 2.7 -Requires: php-composer(symfony/process) < 4 -Requires: php-composer(symfony/filesystem) >= 2.7 -Requires: php-composer(symfony/filesystem) < 4 +Requires: %{symfony_prefix}-console +Requires: %{symfony_prefix}-finder +Requires: %{symfony_prefix}-process +Requires: %{symfony_prefix}-filesystem # From composer.json, suggest # "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic", # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages" @@ -258,6 +256,10 @@ exit $ret %changelog +* Mon Dec 18 2017 Remi Collet - 1.5.6-1 +- Update to 1.5.6 +- switch to symfony package names + * Fri Dec 1 2017 Remi Collet - 1.5.5-1 - Update to 1.5.5 diff --git a/sources b/sources index 0ed945d..d040cb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.5.5-aab6229.tar.gz) = 29b1e2374412b753ba324436b24fda007434e87cc8ed616f7c31f70efd3ff1024a7b468c8d44285a7e394baa4e4d205c418fe97569731699a06fc06068fbd5aa +SHA512 (composer-1.5.6-4f7f9c1.tar.gz) = f1df0e9ee7ec23dea8564ac124ed5ac0ee219085c64fbbc3ee5aa0e12e58cd63d4afb4eb9df834e60adcccfd921f783ce317bf0c1b5f9d4015895b91aa7658c2 From 3dcd9d92d4891d1d50ec08418abd73372c364900 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Jan 2018 14:36:05 +0100 Subject: [PATCH 37/73] open https://github.com/composer/composer/pull/6974 Fix dependency on composer/spdx-licenses raise dependency on composer/spdx-licenses 1.2 (cherry picked from commit d37a2cbc127c3b6a0a07480d422e53342610dde0) --- .gitignore | 1 + composer-autoload.php | 21 +++++++++++---------- composer.spec | 38 ++++++++++++++++++++++++-------------- makesrc.sh | 28 ++++++++++++++++++++++++++++ sources | 2 +- 5 files changed, 65 insertions(+), 25 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index c926a6b..e8ebb8c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /composer-1.5.4-73aa733.tar.gz /composer-1.5.5-aab6229.tar.gz /composer-1.5.6-4f7f9c1.tar.gz +/composer-1.6.0-87f845d.tgz diff --git a/composer-autoload.php b/composer-autoload.php index f1f20ac..6bead2e 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -7,23 +7,24 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__); // Dependencies -\Fedora\Autoloader\Dependencies::required(array( - array( +\Fedora\Autoloader\Dependencies::required([ + [ + $vendorDir . '/Symfony4/Component/Console/autoload.php', $vendorDir . '/Symfony3/Component/Console/autoload.php', $vendorDir . '/Symfony/Component/Console/autoload.php', - ), - array( + ], [ + $vendorDir . '/Symfony4/Component/Finder/autoload.php', $vendorDir . '/Symfony3/Component/Finder/autoload.php', $vendorDir . '/Symfony/Component/Finder/autoload.php', - ), - array( + ], [ + $vendorDir . '/Symfony4/Component/Process/autoload.php', $vendorDir . '/Symfony3/Component/Process/autoload.php', $vendorDir . '/Symfony/Component/Process/autoload.php', - ), - array( + ], [ + $vendorDir . '/Symfony4/Component/Filesystem/autoload.php', $vendorDir . '/Symfony3/Component/Filesystem/autoload.php', $vendorDir . '/Symfony/Component/Filesystem/autoload.php', - ), + ], $vendorDir . '/Seld/JsonLint/autoload.php', $vendorDir . '/Seld/PharUtils/autoload.php', $vendorDir . '/Seld/CliPrompt/autoload.php', @@ -32,5 +33,5 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; $vendorDir . '/Composer/Semver/autoload.php', $vendorDir . '/Psr/Log/autoload.php', $vendorDir . '/JsonSchema5/autoload.php', -)); +]); diff --git a/composer.spec b/composer.spec index 732e114..b99c6eb 100644 --- a/composer.spec +++ b/composer.spec @@ -6,14 +6,16 @@ # # Please, preserve the changelog entries # -%global gh_commit 4f7f9c12753ec43f1e4629e2a71cabe81f2a4eab +%global gh_commit 87f845d1c14aa22819c51b367ad7e07823f2e2ec %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 prever RC + +%global upstream_version 1.6.0 +#global upstream_prever RC %if 0%{?fedora} >= 27 %global symfony_prefix php-symfony3 @@ -22,19 +24,21 @@ %endif Name: composer -Version: 1.5.6 -Release: 1%{?dist} +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +Release: 2%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries License: MIT URL: https://getcomposer.org/ -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz +Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz Source1: %{name}-autoload.php Source2: %{name}-bootstrap.php # Profile scripts Source3: %{name}.sh Source4: %{name}.csh +# Get a git snapshot to retrieve the test suite +Source5: makesrc.sh # Use our autoloader, resources path, fix for tests Patch0: %{name}-rpm.patch @@ -44,7 +48,7 @@ BuildRequires: php-cli %if %{with_tests} BuildRequires: php-justinrainbow-json-schema5 BuildRequires: php-composer(composer/spdx-licenses) < 2 -BuildRequires: php-composer(composer/spdx-licenses) >= 1.0 +BuildRequires: php-composer(composer/spdx-licenses) >= 1.2 BuildRequires: php-composer(composer/ca-bundle) < 2 BuildRequires: php-composer(composer/ca-bundle) >= 1.0 BuildRequires: php-composer(composer/semver) < 2 @@ -63,9 +67,9 @@ BuildRequires: %{symfony_prefix}-filesystem BuildRequires: %{symfony_prefix}-process BuildRequires: php-zip # From composer.json, "require-dev": { -# "phpunit/phpunit": "^4.5 || ^5.0.5", +# "phpunit/phpunit": "^4.8.35 || ^5.7", # "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" -BuildRequires: php-composer(phpunit/phpunit) >= 4.5 +BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35 # For autoloader BuildRequires: php-composer(fedora/autoloader) >= 0.1.2 BuildRequires: php-seld-phar-utils >= 1.0.1 @@ -80,17 +84,18 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # "composer/semver": "^1.0", # "composer/spdx-licenses": "^1.0", # "seld/jsonlint": "~1.4", -# "symfony/console": "^2.7 || ^3.0", -# "symfony/finder": "^2.7 || ^3.0", -# "symfony/process": "^2.7 || ^3.0", -# "symfony/filesystem": "^2.7 || ^3.0", +# "symfony/console": "^2.7 || ^3.0 || ^4.0", +# "symfony/finder": "^2.7 || ^3.0 || ^4.0", +# "symfony/process": "^2.7 || ^3.0 || ^4.0", +# "symfony/filesystem": "^2.7 || ^3.0 || ^4.0", # "seld/phar-utils": "^1.0", # "seld/cli-prompt": "^1.0", # "psr/log": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-justinrainbow-json-schema5 -Requires: php-composer(composer/spdx-licenses) >= 1.0 +# See https://github.com/composer/composer/pull/6974 +Requires: php-composer(composer/spdx-licenses) >= 1.2 Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/ca-bundle) >= 1.0 Requires: php-composer(composer/ca-bundle) < 2 @@ -231,7 +236,7 @@ export BUILDROOT=%{buildroot} # testIntegration may hang on local build ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then $cmd -d memory_limit=1G %{_bindir}/phpunit \ --filter '^((?!(testIntegration)).)*$' \ @@ -256,6 +261,11 @@ exit $ret %changelog +* Thu Jan 4 2018 Remi Collet - 1.6.0-2 +- open https://github.com/composer/composer/pull/6974 + Fix dependency on composer/spdx-licenses +- raise dependency on composer/spdx-licenses 1.2 + * Mon Dec 18 2017 Remi Collet - 1.5.6-1 - Update to 1.5.6 - switch to symfony package names diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..9615a91 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/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) +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} + +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER\n" + +echo "Cloning..." +git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + +echo "Getting commit..." +pushd $PROJECT-$COMMIT +git checkout $COMMIT +cp composer.json ../composer.json +popd + +echo "Archiving..." +tar czf $NAME-$VERSION$PREVER-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." diff --git a/sources b/sources index d040cb4..42b85aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.5.6-4f7f9c1.tar.gz) = f1df0e9ee7ec23dea8564ac124ed5ac0ee219085c64fbbc3ee5aa0e12e58cd63d4afb4eb9df834e60adcccfd921f783ce317bf0c1b5f9d4015895b91aa7658c2 +SHA512 (composer-1.6.0-87f845d.tgz) = 92f76db3e891db8ddf35617222b9eb4856f2fe974059d1a4addda0fddcc0ec6132654bae9e891e6411efed80eb031c5532769f38bff2ce57173f486c0ac6cbc5 From 31639408c775e1f13c24a8c0c19c533c067b6988 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Jan 2018 14:58:20 +0100 Subject: [PATCH 38/73] v1.6.1 (cherry picked from commit 5fc4f3ba223ac11f776dd9d78e8080ab89a7c28a) --- .gitignore | 1 + composer.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e8ebb8c..461048e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /composer-1.5.5-aab6229.tar.gz /composer-1.5.6-4f7f9c1.tar.gz /composer-1.6.0-87f845d.tgz +/composer-1.6.1-9445e12.tgz diff --git a/composer.spec b/composer.spec index b99c6eb..52585a9 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 87f845d1c14aa22819c51b367ad7e07823f2e2ec +%global gh_commit 9445e12fb3b3db0c4aaeb8e492dd90c2a42b493c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -14,7 +14,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.6.0 +%global upstream_version 1.6.1 #global upstream_prever RC %if 0%{?fedora} >= 27 @@ -25,7 +25,7 @@ Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Dependency Manager for PHP Group: Development/Libraries @@ -82,7 +82,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8 # "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", # "composer/ca-bundle": "^1.0", # "composer/semver": "^1.0", -# "composer/spdx-licenses": "^1.0", +# "composer/spdx-licenses": "^1.2", # "seld/jsonlint": "~1.4", # "symfony/console": "^2.7 || ^3.0 || ^4.0", # "symfony/finder": "^2.7 || ^3.0 || ^4.0", @@ -94,7 +94,6 @@ BuildRequires: php-PsrLog >= 1.0.0-8 Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-justinrainbow-json-schema5 -# See https://github.com/composer/composer/pull/6974 Requires: php-composer(composer/spdx-licenses) >= 1.2 Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/ca-bundle) >= 1.0 @@ -261,6 +260,9 @@ exit $ret %changelog +* Thu Jan 4 2018 Remi Collet - 1.6.1-1 +- Update to 1.6.1 + * Thu Jan 4 2018 Remi Collet - 1.6.0-2 - open https://github.com/composer/composer/pull/6974 Fix dependency on composer/spdx-licenses diff --git a/sources b/sources index 42b85aa..7023141 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.6.0-87f845d.tgz) = 92f76db3e891db8ddf35617222b9eb4856f2fe974059d1a4addda0fddcc0ec6132654bae9e891e6411efed80eb031c5532769f38bff2ce57173f486c0ac6cbc5 +SHA512 (composer-1.6.1-9445e12.tgz) = 3a706486447d482bd76c66a876231496417072f68410c5a6ac7ee20d47bddcb78cf6aa585c678f47c58ce9000914dfa9817e9e37286ebca3751f7fa48af4fafa From ca67cbcb39f37a607f6349e7cf077756087b3d92 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 8 Jan 2018 09:42:28 +0100 Subject: [PATCH 39/73] v1.6.2 (cherry picked from commit 87478494d4a0510fd42cd07e9e8397f8164f724e) --- .gitignore | 1 + composer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 461048e..a0f4bae 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /composer-1.5.6-4f7f9c1.tar.gz /composer-1.6.0-87f845d.tgz /composer-1.6.1-9445e12.tgz +/composer-1.6.2-db191ab.tgz diff --git a/composer.spec b/composer.spec index 52585a9..95ac435 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 9445e12fb3b3db0c4aaeb8e492dd90c2a42b493c +%global gh_commit db191abd24b0be110c98ba2271ca992e1c70962f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -14,7 +14,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.6.1 +%global upstream_version 1.6.2 #global upstream_prever RC %if 0%{?fedora} >= 27 @@ -260,6 +260,9 @@ exit $ret %changelog +* Sun Jan 7 2018 Remi Collet - 1.6.2-1 +- Update to 1.6.2 + * Thu Jan 4 2018 Remi Collet - 1.6.1-1 - Update to 1.6.1 diff --git a/sources b/sources index 7023141..2fb0977 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.6.1-9445e12.tgz) = 3a706486447d482bd76c66a876231496417072f68410c5a6ac7ee20d47bddcb78cf6aa585c678f47c58ce9000914dfa9817e9e37286ebca3751f7fa48af4fafa +SHA512 (composer-1.6.2-db191ab.tgz) = 3e3b6049dd4e4127aad467e1d75f1ff6183124c1e55e17c7f5ec064239ff605f18623238996e190807daff18f8241e0f7c4d097326c0a7ff5bd7c8195d0bab5f From ae53a133a8c20b4611d1ebaba5e7624012990112 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Feb 2018 06:21:15 +0100 Subject: [PATCH 40/73] v1.6.3 (cherry picked from commit f6355642c6238e353393049cbdbdbc5b9b0d8a10) --- .gitignore | 1 + composer.spec | 29 ++++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a0f4bae..563fe83 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /composer-1.6.0-87f845d.tgz /composer-1.6.1-9445e12.tgz /composer-1.6.2-db191ab.tgz +/composer-1.6.3-88a69fd.tgz diff --git a/composer.spec b/composer.spec index 95ac435..01adaf9 100644 --- a/composer.spec +++ b/composer.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit db191abd24b0be110c98ba2271ca992e1c70962f +%global gh_commit 88a69fda0f2187ad8714cedffd7a8872dceaa4c2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -14,7 +14,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.6.2 +%global upstream_version 1.6.3 #global upstream_prever RC %if 0%{?fedora} >= 27 @@ -47,6 +47,15 @@ BuildArch: noarch BuildRequires: php-cli %if %{with_tests} BuildRequires: php-justinrainbow-json-schema5 +%if 0%{?fedora} >= 27 +BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 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(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(seld/cli-prompt) >= 1.0 with php-composer(seld/cli-prompt) < 2) +BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +%else BuildRequires: php-composer(composer/spdx-licenses) < 2 BuildRequires: php-composer(composer/spdx-licenses) >= 1.2 BuildRequires: php-composer(composer/ca-bundle) < 2 @@ -61,6 +70,7 @@ BuildRequires: php-composer(seld/cli-prompt) < 2 BuildRequires: php-composer(seld/cli-prompt) >= 1.0 BuildRequires: php-composer(psr/log) < 2 BuildRequires: php-composer(psr/log) >= 1.0 +%endif BuildRequires: %{symfony_prefix}-console BuildRequires: %{symfony_prefix}-finder BuildRequires: %{symfony_prefix}-filesystem @@ -94,6 +104,15 @@ BuildRequires: php-PsrLog >= 1.0.0-8 Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-justinrainbow-json-schema5 +%if 0%{?fedora} >= 27 +Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 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(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(seld/cli-prompt) >= 1.0 with php-composer(seld/cli-prompt) < 2) +Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +%else Requires: php-composer(composer/spdx-licenses) >= 1.2 Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/ca-bundle) >= 1.0 @@ -108,6 +127,7 @@ Requires: php-composer(seld/cli-prompt) >= 1.0 Requires: php-composer(seld/cli-prompt) < 2 Requires: php-composer(psr/log) >= 1.0 Requires: php-composer(psr/log) < 2 +%endif Requires: %{symfony_prefix}-console Requires: %{symfony_prefix}-finder Requires: %{symfony_prefix}-process @@ -260,6 +280,9 @@ exit $ret %changelog +* Thu Feb 1 2018 Remi Collet - 1.6.3-1 +- Update to 1.6.3 + * Sun Jan 7 2018 Remi Collet - 1.6.2-1 - Update to 1.6.2 diff --git a/sources b/sources index 2fb0977..48e9b06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.6.2-db191ab.tgz) = 3e3b6049dd4e4127aad467e1d75f1ff6183124c1e55e17c7f5ec064239ff605f18623238996e190807daff18f8241e0f7c4d097326c0a7ff5bd7c8195d0bab5f +SHA512 (composer-1.6.3-88a69fd.tgz) = c9e74f585c858fc0d5e26f30585ab595099dbc3020b7fd02eefd117875d07bc4a6da7a214160991b26510996968c471477bc7dc7d4b1e1d03162ed6d0da1a0f3 From ef5c17cd28e660ec20484278477e91061b162e6d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Feb 2018 14:19:44 +0100 Subject: [PATCH 41/73] v1.6.4 (cherry picked from commit eb6c4ddf21afeb0de626359d17d649d7e7b3e43b) (cherry picked from commit 96c24482dc9e81b2c838adbff8a34b65af6cdca5) (cherry picked from commit 8cc59312c596db6739bcb2a9a790b3dee91fdcbe) (cherry picked from commit 8a0b6a520aad19971143b43768d3020c0bdd95ea) (cherry picked from commit 3515fc6b6738439eaa0c17c27249f0b34de1fbeb) --- .gitignore | 1 + composer-autoload.php | 21 ++++----------------- composer.spec | 14 +++++++++++--- sources | 2 +- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 563fe83..1a08248 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /composer-1.6.1-9445e12.tgz /composer-1.6.2-db191ab.tgz /composer-1.6.3-88a69fd.tgz +/composer-1.6.4-86ad51e.tgz diff --git a/composer-autoload.php b/composer-autoload.php index 6bead2e..04b2616 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -8,23 +8,10 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; // Dependencies \Fedora\Autoloader\Dependencies::required([ - [ - $vendorDir . '/Symfony4/Component/Console/autoload.php', - $vendorDir . '/Symfony3/Component/Console/autoload.php', - $vendorDir . '/Symfony/Component/Console/autoload.php', - ], [ - $vendorDir . '/Symfony4/Component/Finder/autoload.php', - $vendorDir . '/Symfony3/Component/Finder/autoload.php', - $vendorDir . '/Symfony/Component/Finder/autoload.php', - ], [ - $vendorDir . '/Symfony4/Component/Process/autoload.php', - $vendorDir . '/Symfony3/Component/Process/autoload.php', - $vendorDir . '/Symfony/Component/Process/autoload.php', - ], [ - $vendorDir . '/Symfony4/Component/Filesystem/autoload.php', - $vendorDir . '/Symfony3/Component/Filesystem/autoload.php', - $vendorDir . '/Symfony/Component/Filesystem/autoload.php', - ], + $vendorDir . '/Symfony/Component/Console/autoload.php', + $vendorDir . '/Symfony/Component/Finder/autoload.php', + $vendorDir . '/Symfony/Component/Process/autoload.php', + $vendorDir . '/Symfony/Component/Filesystem/autoload.php', $vendorDir . '/Seld/JsonLint/autoload.php', $vendorDir . '/Seld/PharUtils/autoload.php', $vendorDir . '/Seld/CliPrompt/autoload.php', diff --git a/composer.spec b/composer.spec index 01adaf9..bea8188 100644 --- a/composer.spec +++ b/composer.spec @@ -6,7 +6,11 @@ # # Please, preserve the changelog entries # -%global gh_commit 88a69fda0f2187ad8714cedffd7a8872dceaa4c2 + +# For compatibility with SCL +%undefine __brp_mangle_shebangs + +%global gh_commit 86ad51e8a3c64c9782446aae740a61fc6faa2522 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -14,10 +18,11 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.6.3 +%global upstream_version 1.6.4 #global upstream_prever RC -%if 0%{?fedora} >= 27 +%if 0 +# see https://forum.remirepo.net/viewtopic.php?id=3677 %global symfony_prefix php-symfony3 %else %global symfony_prefix php-symfony @@ -280,6 +285,9 @@ exit $ret %changelog +* Mon Apr 16 2018 Remi Collet - 1.6.4-1 +- update to 1.6.4 + * Thu Feb 1 2018 Remi Collet - 1.6.3-1 - Update to 1.6.3 diff --git a/sources b/sources index 48e9b06..2717e6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.6.3-88a69fd.tgz) = c9e74f585c858fc0d5e26f30585ab595099dbc3020b7fd02eefd117875d07bc4a6da7a214160991b26510996968c471477bc7dc7d4b1e1d03162ed6d0da1a0f3 +SHA512 (composer-1.6.4-86ad51e.tgz) = 81bd38b44b03f43343ac7a5cbe094d5199dba33e0d4a208837e930a44cea94d58ddfbf339b8424e7db19c58f977c180d490306f316375eb5cf2d73f4c1970ee3 From be225487f8b51644af1f510ede7c42d4ea1396a0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 May 2018 13:09:03 +0200 Subject: [PATCH 42/73] v1.6.5 (cherry picked from commit bf48ffd3e83e21aea26855d641cf2d60e781434e) --- .gitignore | 1 + composer-rpm.patch | 26 +++++++++++++------------- composer.spec | 11 +++++++---- sources | 2 +- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 1a08248..8d6909d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /composer-1.6.2-db191ab.tgz /composer-1.6.3-88a69fd.tgz /composer-1.6.4-86ad51e.tgz +/composer-1.6.5-b184a92.tgz diff --git a/composer-rpm.patch b/composer-rpm.patch index 9b896a2..44eb5b1 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,18 +1,18 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2017-03-08 17:51:24.000000000 +0100 -+++ ./bin/composer 2017-03-08 19:16:24.206124958 +0100 -@@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') { - echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL; +--- ./bin/composer.rpm 2018-05-04 12:59:13.065292434 +0200 ++++ ./bin/composer 2018-05-04 13:00:23.293493373 +0200 +@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') { } + setlocale(LC_ALL, 'C'); -require __DIR__.'/../src/bootstrap.php'; +require '/usr/share/php/Composer/autoload.php'; use Composer\Factory; use Composer\XdebugHandler; diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php ---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2017-03-08 17:51:24.000000000 +0100 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2017-03-08 19:16:24.207124963 +0100 +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2018-05-04 12:57:41.000000000 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2018-05-04 12:59:13.066292451 +0200 @@ -305,7 +305,7 @@ EOF; file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion)); @@ -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 2017-03-08 17:51:24.000000000 +0100 -+++ ./src/Composer/Compiler.php 2017-03-08 19:16:24.207124963 +0100 +--- ./src/Composer/Compiler.php.rpm 2018-05-04 12:57:41.000000000 +0200 ++++ ./src/Composer/Compiler.php 2018-05-04 12:59:13.066292451 +0200 @@ -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 2017-03-08 19:16:24.207124963 +0100 -+++ ./src/Composer/Json/JsonFile.php 2017-03-08 19:17:35.148449586 +0100 +--- ./src/Composer/Json/JsonFile.php.rpm 2018-05-04 12:57:41.000000000 +0200 ++++ ./src/Composer/Json/JsonFile.php 2018-05-04 12:59:13.066292451 +0200 @@ -156,7 +156,7 @@ class JsonFile self::validateSyntax($content, $this->path); } @@ -47,9 +47,9 @@ 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) 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 2017-03-08 19:16:24.207124963 +0100 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2017-03-08 19:19:02.243848127 +0100 -@@ -96,7 +96,8 @@ class ComposerSchemaTest extends \PHPUni +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2018-05-04 12:57:41.000000000 +0200 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2018-05-04 12:59:13.066292451 +0200 +@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { $validator = new Validator(); diff --git a/composer.spec b/composer.spec index bea8188..76f3efd 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 86ad51e8a3c64c9782446aae740a61fc6faa2522 +%global gh_commit b184a92419cc9a9c4c6a09db555a94d441cb11c9 %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.6.4 +%global upstream_version 1.6.5 #global upstream_prever RC %if 0 @@ -52,7 +52,7 @@ BuildArch: noarch BuildRequires: php-cli %if %{with_tests} BuildRequires: php-justinrainbow-json-schema5 -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 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) @@ -109,7 +109,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8 Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-justinrainbow-json-schema5 -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 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) @@ -285,6 +285,9 @@ exit $ret %changelog +* Fri May 4 2018 Remi Collet - 1.6.5-1 +- update to 1.6.5 + * Mon Apr 16 2018 Remi Collet - 1.6.4-1 - update to 1.6.4 diff --git a/sources b/sources index 2717e6f..fc7a589 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.6.4-86ad51e.tgz) = 81bd38b44b03f43343ac7a5cbe094d5199dba33e0d4a208837e930a44cea94d58ddfbf339b8424e7db19c58f977c180d490306f316375eb5cf2d73f4c1970ee3 +SHA512 (composer-1.6.5-b184a92.tgz) = 9aba64c856c6c0679ee2c373d2428cbc07ff791a7c673ad129e6bce36c9b69ab5d60dae8698312d063f79a35fd183d6c80cf1db0a64e06b0cf7c684b6dc5515d From 14887b950c837be7f53226101edcdab47b4252a5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 17 Aug 2018 08:23:18 +0200 Subject: [PATCH 43/73] update to 1.7.2 drop dependency on seld/cli-prompt add dependency on composer/xdebug-handler (cherry picked from commit a950d26931d7987c5e2ca389834de44061c3ec77) (cherry picked from commit 28ebc6a406591f7c45e65cdabfd56ea342408239) --- .gitignore | 1 + composer-autoload.php | 2 +- composer-rpm.patch | 24 +++++++++---------- composer.spec | 55 +++++++++++++++++++++++-------------------- sources | 2 +- 5 files changed, 45 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 8d6909d..ed20f1e 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ clog /composer-1.6.3-88a69fd.tgz /composer-1.6.4-86ad51e.tgz /composer-1.6.5-b184a92.tgz +/composer-1.7.2-576aab9.tgz diff --git a/composer-autoload.php b/composer-autoload.php index 04b2616..15e9c21 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -14,10 +14,10 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; $vendorDir . '/Symfony/Component/Filesystem/autoload.php', $vendorDir . '/Seld/JsonLint/autoload.php', $vendorDir . '/Seld/PharUtils/autoload.php', - $vendorDir . '/Seld/CliPrompt/autoload.php', $vendorDir . '/Composer/CaBundle/autoload.php', $vendorDir . '/Composer/Spdx/autoload.php', $vendorDir . '/Composer/Semver/autoload.php', + $vendorDir . '/Composer/XdebugHandler/autoload.php', $vendorDir . '/Psr/Log/autoload.php', $vendorDir . '/JsonSchema5/autoload.php', ]); diff --git a/composer-rpm.patch b/composer-rpm.patch index 44eb5b1..3ed61f4 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2018-05-04 12:59:13.065292434 +0200 -+++ ./bin/composer 2018-05-04 13:00:23.293493373 +0200 +--- ./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') { } @@ -8,11 +8,11 @@ diff -up ./bin/composer.rpm ./bin/composer -require __DIR__.'/../src/bootstrap.php'; +require '/usr/share/php/Composer/autoload.php'; - use Composer\Factory; - use Composer\XdebugHandler; + 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-05-04 12:57:41.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2018-05-04 12:59:13.066292451 +0200 +--- ./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; file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion)); @@ -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-05-04 12:57:41.000000000 +0200 -+++ ./src/Composer/Compiler.php 2018-05-04 12:59:13.066292451 +0200 +--- ./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 @@ -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 2018-05-04 12:57:41.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2018-05-04 12:59:13.066292451 +0200 +--- ./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); } @@ -47,8 +47,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) 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-05-04 12:57:41.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2018-05-04 12:59:13.066292451 +0200 +--- ./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 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { diff --git a/composer.spec b/composer.spec index 76f3efd..d25851c 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b184a92419cc9a9c4c6a09db555a94d441cb11c9 +%global gh_commit 576aab9b5abb2ed11a1c52353a759363216a4ad2 %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.6.5 +%global upstream_version 1.7.2 #global upstream_prever RC %if 0 @@ -53,26 +53,26 @@ BuildRequires: php-cli %if %{with_tests} BuildRequires: php-justinrainbow-json-schema5 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 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(seld/cli-prompt) >= 1.0 with php-composer(seld/cli-prompt) < 2) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) %else -BuildRequires: php-composer(composer/spdx-licenses) < 2 -BuildRequires: php-composer(composer/spdx-licenses) >= 1.2 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(seld/cli-prompt) < 2 -BuildRequires: php-composer(seld/cli-prompt) >= 1.0 BuildRequires: php-composer(psr/log) < 2 BuildRequires: php-composer(psr/log) >= 1.0 %endif @@ -88,48 +88,47 @@ BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35 # For autoloader BuildRequires: php-composer(fedora/autoloader) >= 0.1.2 BuildRequires: php-seld-phar-utils >= 1.0.1 -BuildRequires: php-seld-cli-prompt >= 1.0.0-3 BuildRequires: php-PsrLog >= 1.0.0-8 %endif # From composer.json, "require": { # "php": "^5.3.2 || ^7.0", -# "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", # "composer/ca-bundle": "^1.0", # "composer/semver": "^1.0", # "composer/spdx-licenses": "^1.2", +# "composer/xdebug-handler": "^1.1", +# "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", +# "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/filesystem": "^2.7 || ^3.0 || ^4.0", -# "seld/phar-utils": "^1.0", -# "seld/cli-prompt": "^1.0", -# "psr/log": "^1.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/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 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(seld/cli-prompt) >= 1.0 with php-composer(seld/cli-prompt) < 2) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) %else -Requires: php-composer(composer/spdx-licenses) >= 1.2 -Requires: php-composer(composer/spdx-licenses) < 2 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(seld/cli-prompt) >= 1.0 -Requires: php-composer(seld/cli-prompt) < 2 Requires: php-composer(psr/log) >= 1.0 Requires: php-composer(psr/log) < 2 %endif @@ -138,14 +137,15 @@ Requires: %{symfony_prefix}-finder Requires: %{symfony_prefix}-process Requires: %{symfony_prefix}-filesystem # From composer.json, suggest -# "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic", -# "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages" -Requires: php-zip +# "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", +# "ext-zip": "Enabling the zip extension allows you to unzip archives", +# "ext-zlib": "Allow gzip compression of HTTP requests" Requires: php-openssl +Requires: php-zip +Requires: php-zlib # For our autoloader Requires: php-composer(fedora/autoloader) Requires: php-seld-phar-utils >= 1.0.1 -Requires: php-seld-cli-prompt >= 1.0.0-3 Requires: php-PsrLog >= 1.0.0-8 # From phpcompatinfo Requires: php-curl @@ -260,7 +260,7 @@ export BUILDROOT=%{buildroot} # testIntegration may hang on local build ret=0 -for cmd in php php70 php71 php72; do +for cmd in php php70 php71 php72 php73; do if which $cmd; then $cmd -d memory_limit=1G %{_bindir}/phpunit \ --filter '^((?!(testIntegration)).)*$' \ @@ -285,6 +285,11 @@ exit $ret %changelog +* Fri Aug 17 2018 Remi Collet - 1.7.2-1 +- update to 1.7.2 +- drop dependency on seld/cli-prompt +- add dependency on composer/xdebug-handler + * Fri May 4 2018 Remi Collet - 1.6.5-1 - update to 1.6.5 diff --git a/sources b/sources index fc7a589..6879ef7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.6.5-b184a92.tgz) = 9aba64c856c6c0679ee2c373d2428cbc07ff791a7c673ad129e6bce36c9b69ab5d60dae8698312d063f79a35fd183d6c80cf1db0a64e06b0cf7c684b6dc5515d +SHA512 (composer-1.7.2-576aab9.tgz) = 9352fe99c7747a75b2f59a0ed4aa1cdd69c7ef76ff707508bb05ddd9432ca50774bd9eab1471516e2e42f9dd447fa6e035676107c0fc573500a07dfb9d062d49 From d1eaddbaa693c2d21aa1c27643769ab40e82c7ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 2 Nov 2018 08:46:39 +0100 Subject: [PATCH 44/73] v1.7.3 (cherry picked from commit a05a2ee8e169a544f436610d157836f9f8e7f26c) --- .gitignore | 23 +---------------------- composer.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index ed20f1e..f2c4f65 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,2 @@ clog -/composer-1.3.0-e53f9e5.tar.gz -/composer-1.3.1-91dbca5.tar.gz -/composer-1.3.2-e7569ed.tar.gz -/composer-1.3.3-989d687.tar.gz -/composer-1.4.0-b19655f.tar.gz -/composer-1.4.1-7ee2a5e.tar.gz -/composer-1.4.2-489e09e.tar.gz -/composer-1.4.3-62c17fd.tar.gz -/composer-1.5.0-6f3310c.tar.gz -/composer-1.5.1-d60a1ff.tar.gz -/composer-1.5.2-c639623.tar.gz -/composer-1.5.3-de0c4af.tar.gz -/composer-1.5.4-73aa733.tar.gz -/composer-1.5.5-aab6229.tar.gz -/composer-1.5.6-4f7f9c1.tar.gz -/composer-1.6.0-87f845d.tgz -/composer-1.6.1-9445e12.tgz -/composer-1.6.2-db191ab.tgz -/composer-1.6.3-88a69fd.tgz -/composer-1.6.4-86ad51e.tgz -/composer-1.6.5-b184a92.tgz -/composer-1.7.2-576aab9.tgz +/composer-*.tgz diff --git a/composer.spec b/composer.spec index d25851c..3bc061e 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 576aab9b5abb2ed11a1c52353a759363216a4ad2 +%global gh_commit e965b9aaa8854c3067f1ed2ae45f436572d73eb7 %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.7.2 +%global upstream_version 1.7.3 #global upstream_prever RC %if 0 @@ -33,7 +33,6 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: Dependency Manager for PHP -Group: Development/Libraries License: MIT URL: https://getcomposer.org/ Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz @@ -285,6 +284,9 @@ exit $ret %changelog +* Fri Nov 2 2018 Remi Collet - 1.7.3-1 +- update to 1.7.3 + * Fri Aug 17 2018 Remi Collet - 1.7.2-1 - update to 1.7.2 - drop dependency on seld/cli-prompt diff --git a/sources b/sources index 6879ef7..f17a96f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.7.2-576aab9.tgz) = 9352fe99c7747a75b2f59a0ed4aa1cdd69c7ef76ff707508bb05ddd9432ca50774bd9eab1471516e2e42f9dd447fa6e035676107c0fc573500a07dfb9d062d49 +SHA512 (composer-1.7.3-e965b9a.tgz) = 252280d6b4aee501c11e7fd512ccbef28ea1e2116b7163c184661a7132717647e38beb62c9f8311b7e5e3227c42f9de26d2c1cefc8fce02307987f44130f70ac From d802b9f007eb1aab134f852174d3a09f7441d7ec Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 3 Dec 2018 11:24:34 +0100 Subject: [PATCH 45/73] v1.8.0 (cherry picked from commit 9af14ecd276522a0715b6cc957d0403c873d5c88) --- composer-bootstrap.php | 2 -- composer.spec | 12 +++++------- sources | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/composer-bootstrap.php b/composer-bootstrap.php index 279f1cc..19d75b3 100644 --- a/composer-bootstrap.php +++ b/composer-bootstrap.php @@ -1,5 +1,3 @@ - 1.8.0-1 +- update to 1.8.0 + * Fri Nov 2 2018 Remi Collet - 1.7.3-1 - update to 1.7.3 diff --git a/sources b/sources index f17a96f..06ea606 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.7.3-e965b9a.tgz) = 252280d6b4aee501c11e7fd512ccbef28ea1e2116b7163c184661a7132717647e38beb62c9f8311b7e5e3227c42f9de26d2c1cefc8fce02307987f44130f70ac +SHA512 (composer-1.8.0-d8aef3a.tgz) = f7a2c333e014e43c4ad9c5239186c2c8049a5bdd14baf4dc03c8f27a4ef9ba012e2a43565e32e0b7e85a285cfe4671356283e4c38d358686f784b01cc0470745 From 8649f9fbeb9bca0d400f0f314cbe8d3c13a5ed27 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Jan 2019 10:33:54 +0100 Subject: [PATCH 46/73] v1.8.3 (cherry picked from commit 1d60fc1215b5a8935ccd8f3b53e35cefab78b3e5) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index aa06ddf..5325709 100644 --- a/composer.spec +++ b/composer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2018 Remi Collet +# Copyright (c) 2015-2019 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 d8aef3af866b28786ce9b8647e52c42496436669 +%global gh_commit a6a3b44581398b7135c7baa0557b7c5b10808b47 %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.0 +%global upstream_version 1.8.3 #global upstream_prever RC %if 0 @@ -279,6 +279,9 @@ exit $ret %changelog +* Wed Jan 30 2019 Remi Collet - 1.8.3-1 +- update to 1.8.3 + * Mon Dec 3 2018 Remi Collet - 1.8.0-1 - update to 1.8.0 diff --git a/sources b/sources index 06ea606..108a970 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.8.0-d8aef3a.tgz) = f7a2c333e014e43c4ad9c5239186c2c8049a5bdd14baf4dc03c8f27a4ef9ba012e2a43565e32e0b7e85a285cfe4671356283e4c38d358686f784b01cc0470745 +SHA512 (composer-1.8.3-a6a3b44.tgz) = c394d16cd24bfb98aa71b93596341d79cbd5ea2cb662332eef1fd2765f0306ba17e5ffe3144ab4c8f3c0ed7b6fdc0eff57d38b70883391ee8a45cb8c1b8cfdf1 From 45cf6da7d819f09946e5d25a917eacfba638f4c0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Feb 2019 14:35:27 +0100 Subject: [PATCH 47/73] v1.8.4 (cherry picked from commit 7071d705f10a73212844e3fe53026ee1766b6562) (cherry picked from commit 2f6de12ba0cd6b66d066e5058cd18246c4d8e182) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 5325709..07c4303 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a6a3b44581398b7135c7baa0557b7c5b10808b47 +%global gh_commit bc364c2480c17941e2135cfc568fa41794392534 %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.3 +%global upstream_version 1.8.4 #global upstream_prever RC %if 0 @@ -279,6 +279,9 @@ exit $ret %changelog +* Mon Feb 11 2019 Remi Collet - 1.8.4-1 +- update to 1.8.4 + * Wed Jan 30 2019 Remi Collet - 1.8.3-1 - update to 1.8.3 diff --git a/sources b/sources index 108a970..3f49f62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.8.3-a6a3b44.tgz) = c394d16cd24bfb98aa71b93596341d79cbd5ea2cb662332eef1fd2765f0306ba17e5ffe3144ab4c8f3c0ed7b6fdc0eff57d38b70883391ee8a45cb8c1b8cfdf1 +SHA512 (composer-1.8.4-bc364c2.tgz) = 77c75f9ba6d05ce055e4f43266efb0bce33e20738ac2c13d453ba83d9cae504e64dc0c474c7323613564b085a51ae10e6fc1d2ce03dcd07d352d2a6734708c46 From 341dc357147ad4187256cca065e9fba3497804e3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Apr 2019 08:38:36 +0200 Subject: [PATCH 48/73] v1.8.5 (cherry picked from commit 3cd393463e753395a01c3b4bae58e8a16106faa3) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index 07c4303..e6057bb 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit bc364c2480c17941e2135cfc568fa41794392534 +%global gh_commit 949b116f9e7d98d8d276594fed74b580d125c0e6 %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.4 +%global upstream_version 1.8.5 #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 php70 php71 php72 php73; do +for cmd in php php71 php72 php73; do if which $cmd; then $cmd -d memory_limit=1G %{_bindir}/phpunit \ --filter '^((?!(testIntegration)).)*$' \ @@ -279,6 +279,9 @@ exit $ret %changelog +* Wed Apr 10 2019 Remi Collet - 1.8.5-1 +- update to 1.8.5 + * Mon Feb 11 2019 Remi Collet - 1.8.4-1 - update to 1.8.4 diff --git a/sources b/sources index 3f49f62..9e9ddf3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.8.4-bc364c2.tgz) = 77c75f9ba6d05ce055e4f43266efb0bce33e20738ac2c13d453ba83d9cae504e64dc0c474c7323613564b085a51ae10e6fc1d2ce03dcd07d352d2a6734708c46 +SHA512 (composer-1.8.5-949b116.tgz) = a7cbf9fd51ec836458910929dc82e4f1e922d152531337773c014403628e762e83fb761f9a9673e254f60d29538b3bec3dea77ff3bbc0121b5dc5ff4b4cd394c From f04dfad582c763e8c12a7d4defd9c149110e9741 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Jun 2019 10:31:25 +0200 Subject: [PATCH 49/73] v1.8.6 (cherry picked from commit 3f14c1f126ff6e35d723f536be660e1740e0e45f) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index e6057bb..2c35dac 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 949b116f9e7d98d8d276594fed74b580d125c0e6 +%global gh_commit 19b5f66a0e233eb944f134df34091fe1c5dfcc11 %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.5 +%global upstream_version 1.8.6 #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; do +for cmd in php php71 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 Jun 11 2019 Remi Collet - 1.8.6-1 +- update to 1.8.6 + * Wed Apr 10 2019 Remi Collet - 1.8.5-1 - update to 1.8.5 diff --git a/sources b/sources index 9e9ddf3..82a26bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.8.5-949b116.tgz) = a7cbf9fd51ec836458910929dc82e4f1e922d152531337773c014403628e762e83fb761f9a9673e254f60d29538b3bec3dea77ff3bbc0121b5dc5ff4b4cd394c +SHA512 (composer-1.8.6-19b5f66.tgz) = 12158c392f8987567d2ed902d52671b37a910498918cf76db30e6eb1110cf6fa3eac27279d5054dbfc92d83fe4a36f69211331ad580e7c3156ded71d68429f7b From 6f118fa8e6a069e6bca95c0fdf68d030628d800b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Aug 2019 15:14:57 +0200 Subject: [PATCH 50/73] v1.9.0 (cherry picked from commit 609e0792cab485f369f7c369147ee159e1efa8e6) (cherry picked from commit 65fe2493c7ca7f8c90caac08e250f606d40e40e1) --- 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 2c35dac..e459e0a 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 241caae1165ef08ded7d88ba1ea7a2a670c092ba Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Nov 2019 11:20:04 +0100 Subject: [PATCH 51/73] 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 e459e0a..0035dc4 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 29cb219c0fe1bf0b43039d7e5600fc0a5ab20308 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Jan 2020 08:00:39 +0100 Subject: [PATCH 52/73] 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 0035dc4..6dc2119 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 b3a8cffcef3fe48aa088a1c9628ab606112da139 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Feb 2020 14:37:13 +0100 Subject: [PATCH 53/73] 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 6dc2119..4854538 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 3c4c416c30507e8307947b0031660952684bd122 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Mar 2020 09:09:51 +0100 Subject: [PATCH 54/73] 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 4854538..1ab1006 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 d7d25be3d6a7111015915620f9e23332c80261a2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Mar 2020 08:43:44 +0100 Subject: [PATCH 55/73] v1.10.1 (cherry picked from commit 64d6db274c735701ef39e95c7471ec7542dcbf41) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 1ab1006..0c2d1c2 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 61925d39ca363f97d2e699e979f8885875d43da5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Apr 2020 07:52:54 +0200 Subject: [PATCH 56/73] 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 0c2d1c2..7576ffc 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 64bf33a08291326ad258aa01a03f32f494659228 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Apr 2020 12:24:30 +0200 Subject: [PATCH 57/73] 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 7576ffc..189614d 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 de91885e6dfaf12b0dd7df1c088abe21b092d3e2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 May 2020 11:11:43 +0200 Subject: [PATCH 58/73] 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 189614d..1428976 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 e0ad692a7b725a59d3457c7bed288fb405758370 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Jun 2020 11:52:12 +0200 Subject: [PATCH 59/73] 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 1428976..9058b12 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 792cfb93ab831c905b27f857e8eab3ba3b0c2ae3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 25 Jun 2020 07:17:15 +0200 Subject: [PATCH 60/73] 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 9058b12..563ff66 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 92a878bb9bfaa68cb1a8cba453a3cb45cf54943a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Jul 2020 13:59:40 +0200 Subject: [PATCH 61/73] 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 563ff66..f7f52d7 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 2c303639ed30e243e39beba3276154591b5d1dcb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Aug 2020 13:43:35 +0200 Subject: [PATCH 62/73] 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 f7f52d7..7990c95 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 6c6c156fe913ebb7bcc93cb96011123e5b2811b7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Sep 2020 07:47:25 +0200 Subject: [PATCH 63/73] 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 7990c95..320870a 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 7cb6bd1499a1e0610bba2a871f1c35c5c1a5e13c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Sep 2020 14:13:22 +0200 Subject: [PATCH 64/73] 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 320870a..6af9f2b 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 62d7c356546132ce97cf716893f45c7153187ac8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 13 Oct 2020 16:12:05 +0200 Subject: [PATCH 65/73] 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 6af9f2b..62b5881 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 6a971eb74d9259c5f208ca600a757e81d0504379 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Oct 2020 10:38:32 +0100 Subject: [PATCH 66/73] 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 62b5881..4fde968 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 bd46b118a676766a9ffd7b1d4ca0643486a6123c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Nov 2020 07:46:46 +0100 Subject: [PATCH 67/73] 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 4fde968..b01987d 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 From 1592eb053b89c1067c82a5aaa676a8cfd409ed9f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Dec 2020 11:38:04 +0100 Subject: [PATCH 68/73] v1.10.19 (cherry picked from commit 13953f20f854144a1bee2073be69166913e16ef6) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index b01987d..b26b681 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 09d42e18394d8594be24e37923031c4b7442a1cb +%global gh_commit 196601d50c08c3fae389a417a7689367fcf37cef %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.17 +%global upstream_version 1.10.19 #global upstream_prever RC %if 0 @@ -87,7 +87,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8 %endif # From composer.json, "require": { -# "php": "^5.3.2 || ^7.0", +# "php": "^5.3.2 || ^7.0 || ^8.0", # "composer/ca-bundle": "^1.0", # "composer/semver": "^1.0", # "composer/spdx-licenses": "^1.2", @@ -274,6 +274,9 @@ exit $ret %changelog +* Sat Dec 5 2020 Remi Collet - 1.10.19-1 +- update to 1.10.19 + * Mon Nov 2 2020 Remi Collet - 1.10.17-1 - update to 1.10.17 diff --git a/sources b/sources index 14fffcc..2969c8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.17-09d42e1.tgz) = db18e5c4623ed6be0f35b2d4dddddec5df6c1414c6a98b45a5b65f4bbfc7b74feb05cc2f4ecfd14ca2c17cc4988f5696672ed434f7fb2e2607c9c047c27c49c0 +SHA512 (composer-1.10.19-196601d.tgz) = c91c0b7322b80a545bd940c88168a9457cc787c2c6deae428adc61389f89ad010b6cee2cde4692b1682fe5a210b4b952e1bdc47c7bfd0e4438e2f2247b013528 From 5160ff7691b05bce79b08ce02a9e7c7480be0a3d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jan 2021 08:02:25 +0100 Subject: [PATCH 69/73] v1.0.20 (cherry picked from commit 0c43b97372fc40315db6634cd7bec189770b4342) --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index b26b681..924bb5a 100644 --- a/composer.spec +++ b/composer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2020 Remi Collet +# Copyright (c) 2015-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 196601d50c08c3fae389a417a7689367fcf37cef +%global gh_commit e55d297525f0ecc805c813a0f63a40114fd670f6 %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.19 +%global upstream_version 1.10.20 #global upstream_prever RC %if 0 @@ -274,6 +274,9 @@ exit $ret %changelog +* Thu Jan 28 2021 Remi Collet - 1.10.20-1 +- update to 1.10.20 + * Sat Dec 5 2020 Remi Collet - 1.10.19-1 - update to 1.10.19 diff --git a/sources b/sources index 2969c8e..2e9a6bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.19-196601d.tgz) = c91c0b7322b80a545bd940c88168a9457cc787c2c6deae428adc61389f89ad010b6cee2cde4692b1682fe5a210b4b952e1bdc47c7bfd0e4438e2f2247b013528 +SHA512 (composer-1.10.20-e55d297.tgz) = 63fe1befac0ea567f3d206383e76e641a732d76068be291a65614290872984ab2954946d1b6a72585681a5b52aeffe41f9b7d0021f082cc07365edaecbedd734 From f7c02b1a6567ccf164809336e1e33bf4a040a8aa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Apr 2021 13:30:51 +0200 Subject: [PATCH 70/73] v1.10.21 (cherry picked from commit aa502ea77554940d01b560c1de7e151901fabd3a) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 924bb5a..173902f 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit e55d297525f0ecc805c813a0f63a40114fd670f6 +%global gh_commit 04021432f4a9cbd9351dd166b8c193f42c36a39c %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.20 +%global upstream_version 1.10.21 #global upstream_prever RC %if 0 @@ -274,6 +274,9 @@ exit $ret %changelog +* Thu Apr 1 2021 Remi Collet - 1.10.21-1 +- update to 1.10.21 + * Thu Jan 28 2021 Remi Collet - 1.10.20-1 - update to 1.10.20 diff --git a/sources b/sources index 2e9a6bc..8e0159b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.20-e55d297.tgz) = 63fe1befac0ea567f3d206383e76e641a732d76068be291a65614290872984ab2954946d1b6a72585681a5b52aeffe41f9b7d0021f082cc07365edaecbedd734 +SHA512 (composer-1.10.21-0402143.tgz) = b91f17d35765366af44ddc8b9e6ecf1fa57f245ae9f8b27838b7fc677581df3c27e8dd9a158bcebd2c90e04074fd61a091873add99994148a79d1e9652bdf981 From 3bbeab79bc530df54039369fe1078c308da65327 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 May 2021 08:15:00 +0200 Subject: [PATCH 71/73] v1.10.22 (cherry picked from commit 1fc58abcca79f567c385dd60f952e19c3781682c) --- composer.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.spec b/composer.spec index 173902f..ed5239b 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 04021432f4a9cbd9351dd166b8c193f42c36a39c +%global gh_commit 28c9dfbe2351635961f670773e8d7b17bc5eda25 %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.21 +%global upstream_version 1.10.22 #global upstream_prever RC %if 0 @@ -274,6 +274,9 @@ exit $ret %changelog +* Tue Apr 27 2021 Remi Collet - 1.10.22-1 +- update to 1.10.22 + * Thu Apr 1 2021 Remi Collet - 1.10.21-1 - update to 1.10.21 diff --git a/sources b/sources index 8e0159b..c51b7a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.21-0402143.tgz) = b91f17d35765366af44ddc8b9e6ecf1fa57f245ae9f8b27838b7fc677581df3c27e8dd9a158bcebd2c90e04074fd61a091873add99994148a79d1e9652bdf981 +SHA512 (composer-1.10.22-28c9dfb.tgz) = a5508789019530f6f9e6207bad005e37f35923b7286c655fdc1fe485e01a26ce4018f84c803a40b6b1b52c93fd394d61192a75febef7d6756df102d4dc2139ee From 88b1b19ddced8596339bf112129bdf3b6bad14c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 14 Apr 2022 07:13:08 +0200 Subject: [PATCH 72/73] v1.10.26 --- composer.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/composer.spec b/composer.spec index ed5239b..b4df0a7 100644 --- a/composer.spec +++ b/composer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2021 Remi Collet +# Copyright (c) 2015-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 28c9dfbe2351635961f670773e8d7b17bc5eda25 +%global gh_commit 3e196135eacf9e519a6b00986bc6fe6aff977997 %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.22 +%global upstream_version 1.10.26 #global upstream_prever RC %if 0 @@ -274,6 +274,9 @@ exit $ret %changelog +* Thu Apr 14 2022 Remi Collet - 1.10.26-1 +- update to 1.10.26 + * Tue Apr 27 2021 Remi Collet - 1.10.22-1 - update to 1.10.22 diff --git a/sources b/sources index c51b7a7..3ac7510 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.22-28c9dfb.tgz) = a5508789019530f6f9e6207bad005e37f35923b7286c655fdc1fe485e01a26ce4018f84c803a40b6b1b52c93fd394d61192a75febef7d6756df102d4dc2139ee +SHA512 (composer-1.10.26-3e19613.tgz) = abe1cadba212859433e019d83ac7b21d491ae81e6484a67feaf89bd6b87d8a22184425f12b6d5f39ac68569608ba1bb91043cfce7e99e1b8e702a27fa4504fb4 From 3963ff73f9261baf355c9660b84dd1d0aa863fed Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 29 Sep 2023 14:38:49 +0200 Subject: [PATCH 73/73] v1.10.27 --- composer.spec | 15 +++++++++------ sources | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/composer.spec b/composer.spec index b4df0a7..38affb1 100644 --- a/composer.spec +++ b/composer.spec @@ -12,7 +12,7 @@ %bcond_without tests -%global gh_commit 3e196135eacf9e519a6b00986bc6fe6aff977997 +%global gh_commit f8f49191eec76f039b466aa1f161406fe43aff50 %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.26 +%global upstream_version 1.10.27 #global upstream_prever RC %if 0 @@ -51,7 +51,6 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php-cli -%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) @@ -76,15 +75,16 @@ BuildRequires: %{symfony_prefix}-finder BuildRequires: %{symfony_prefix}-filesystem BuildRequires: %{symfony_prefix}-process BuildRequires: php-zip +%if %{with tests} # From composer.json, "require-dev": { # "symfony/phpunit-bridge": "^4.2", # "phpspec/prophecy": "^1.10" BuildRequires: phpunit +%endif # For autoloader BuildRequires: php-composer(fedora/autoloader) >= 0.1.2 BuildRequires: php-seld-phar-utils >= 1.0.1 BuildRequires: php-PsrLog >= 1.0.0-8 -%endif # From composer.json, "require": { # "php": "^5.3.2 || ^7.0 || ^8.0", @@ -173,7 +173,7 @@ Documentation: https://getcomposer.org/doc/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .rpm +%patch -P0 -p1 -b .rpm find . -name \*.rpm -exec rm {} \; -print if grep -r '\.\./res'; then @@ -252,7 +252,7 @@ ret=0 for cmd in php php72 php73 php74; do if which $cmd; then $cmd -d memory_limit=1G %{_bindir}/phpunit \ - --filter '^((?!(testIntegration)).)*$' \ + --filter '^((?!(testIntegration|testUpdateDoesntThrowsRuntimeExceptionIfGitCommandFailsAtFirstButIsAbleToRecover)).)*$' \ --include-path %{buildroot}%{_datadir}/php || ret=1 fi done @@ -274,6 +274,9 @@ exit $ret %changelog +* Fri Sep 29 2023 Remi Collet - 1.10.27-1 +- update to 1.10.27 + * Thu Apr 14 2022 Remi Collet - 1.10.26-1 - update to 1.10.26 diff --git a/sources b/sources index 3ac7510..94852e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (composer-1.10.26-3e19613.tgz) = abe1cadba212859433e019d83ac7b21d491ae81e6484a67feaf89bd6b87d8a22184425f12b6d5f39ac68569608ba1bb91043cfce7e99e1b8e702a27fa4504fb4 +SHA512 (composer-1.10.27-f8f4919.tgz) = 235a54a94c94d9f055048bfdfb5d7fbec677998db83687a516bf24510dedce2a84eea384d5c6162ca2215f39884a36701e61a62d44d7d33db4e27c3230d77ad3