diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-09-21 17:42:22 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-09-21 17:42:22 +0200 |
| commit | 64fd9381d6789429bbf2b497571aedf88af391e5 (patch) | |
| tree | 624017dd97b1a70486068500f8a90354d51cde28 /composer-rpm.patch | |
| parent | 6990c45d17552208a81ab56e35585b4ad6367555 (diff) | |
composer-1.0.0-0.10.20150920git9f2e562
Diffstat (limited to 'composer-rpm.patch')
| -rw-r--r-- | composer-rpm.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch index 35246d0..b6775b7 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2015-07-14 14:37:15.000000000 +0200 -+++ ./bin/composer 2015-07-16 08:58:33.415021590 +0200 +--- ./bin/composer.rpm 2015-09-20 20:44:55.000000000 +0200 ++++ ./bin/composer 2015-09-21 17:38:08.532640919 +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; } @@ -10,9 +10,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; + 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, diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2015-07-14 14:37:15.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2015-07-16 08:58:33.415021590 +0200 +--- ./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 self::validateSyntax($content, $this->path); } @@ -22,15 +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/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php ---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2015-08-23 08:55:33.537606407 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2015-08-23 08:56:17.341809277 +0200 -@@ -268,7 +268,7 @@ EOF; - file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $classMapAuthoritative)); - - $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, |