diff options
| -rw-r--r-- | composer-rpm.patch | 34 | ||||
| -rw-r--r-- | composer.spec | 11 |
2 files changed, 24 insertions, 21 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch index 689ceac..f027f60 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2020-06-03 15:05:42.000000000 +0200 -+++ ./bin/composer 2020-06-03 15:13:38.063176316 +0200 +--- ./bin/composer.rpm 2020-10-25 06:23:06.000000000 +0100 ++++ ./bin/composer 2020-10-25 06:23:12.862707931 +0100 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli' && PHP_SAPI !== ' } @@ -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 2020-06-03 15:13:38.063176316 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2020-06-03 15:14:54.793961118 +0200 -@@ -357,7 +357,7 @@ EOF; +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2020-10-25 06:23:06.000000000 +0100 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2020-10-25 06:23:12.863707931 +0100 +@@ -364,7 +364,7 @@ EOF; $filesystem->filePutContentsIfModified($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion, $checkPlatform)); $filesystem->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php'); @@ -23,20 +23,20 @@ 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 2020-06-03 15:05:42.000000000 +0200 -+++ ./src/Composer/Compiler.php 2020-06-03 15:13:38.063176316 +0200 -@@ -98,7 +98,7 @@ class Compiler +--- ./src/Composer/Compiler.php.rpm 2020-10-25 06:23:12.863707931 +0100 ++++ ./src/Composer/Compiler.php 2020-10-25 06:26:14.912591239 +0100 +@@ -99,7 +99,7 @@ class Compiler + // Add Composer resources $finder = new Finder(); $finder->files() - ->name('*.json') - ->in(__DIR__.'/../../res') + ->in((getenv('BUILDROOT')?:'') . '/usr/share/composer/res') - ->in(SpdxLicenses::getResourcesDir()) ->sort($finderSort) ; + foreach ($finder as $file) { diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2020-06-03 15:05:42.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2020-06-03 15:15:27.901868264 +0200 +--- ./src/Composer/Json/JsonFile.php.rpm 2020-10-25 06:23:06.000000000 +0100 ++++ ./src/Composer/Json/JsonFile.php 2020-10-25 06:23:12.863707931 +0100 @@ -34,7 +34,7 @@ class JsonFile const JSON_PRETTY_PRINT = 128; const JSON_UNESCAPED_UNICODE = 256; @@ -56,9 +56,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) diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php ---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2020-06-03 15:05:42.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2020-06-03 15:13:38.063176316 +0200 -@@ -114,7 +114,8 @@ class ComposerSchemaTest extends TestCas +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2020-10-25 06:23:06.000000000 +0100 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2020-10-25 06:23:12.863707931 +0100 +@@ -113,7 +113,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { $validator = new Validator(); @@ -69,8 +69,8 @@ diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/ if (!$validator->isValid()) { $errors = $validator->getErrors(); diff -up ./tests/Composer/Test/PolyfillTestCase.php.rpm ./tests/Composer/Test/PolyfillTestCase.php ---- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2020-10-15 10:22:22.286612967 +0200 -+++ ./tests/Composer/Test/PolyfillTestCase.php 2020-10-15 10:22:26.860595123 +0200 +--- ./tests/Composer/Test/PolyfillTestCase.php.rpm 2020-10-25 06:23:06.000000000 +0100 ++++ ./tests/Composer/Test/PolyfillTestCase.php 2020-10-25 06:23:12.863707931 +0100 @@ -18,8 +18,33 @@ namespace Composer\Test { use PHPUnit\Framework\Constraint\StringContains; use PHPUnit\Framework\Constraint\TraversableContains; diff --git a/composer.spec b/composer.spec index 8377145..e870079 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a0ac42ef3f75a06321361f4396564f65ccf0ed95 +%global gh_commit 66f4e5d49ff52eecb603e7e5b5bb8645204d0658 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer @@ -19,9 +19,9 @@ %global api_version 2.0.0 %global run_version 2.0.0 -%global upstream_version 2.0.0 -%global upstream_prever RC2 -%global upstream_lower rc2 +%global upstream_version 2.0.1 +#global upstream_prever RC2 +#global upstream_lower rc2 %global symfony_prefix php-symfony %global symfony_path %{_datadir}/php/Symfony @@ -312,6 +312,9 @@ exit $ret %changelog +* Sun Oct 25 2020 Remi Collet <remi@remirepo.net> - 2.0.1-1 +- update to 2.0.1 + * Thu Oct 15 2020 Remi Collet <remi@remirepo.net> - 2.0.0~rc2-1 - update to 2.0.0-RC2 |