diff options
| -rw-r--r-- | composer-rpm.patch | 24 | ||||
| -rw-r--r-- | composer.spec | 7 |
2 files changed, 17 insertions, 14 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch index e16d05d..c8ad2a6 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2015-12-15 10:35:39.000000000 +0100 -+++ ./bin/composer 2015-12-15 16:14:05.574860901 +0100 +--- ./bin/composer.rpm 2016-01-27 14:04:22.000000000 +0100 ++++ ./bin/composer 2016-01-27 15:38:59.527897212 +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\Console\Application; diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php ---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2015-12-15 16:14:05.575860906 +0100 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2015-12-15 16:14:18.054913016 +0100 +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2016-01-27 14:04:22.000000000 +0100 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2016-01-27 15:38:59.528897217 +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)); @@ -23,11 +23,11 @@ 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/Command/DiagnoseCommand.php.rpm ./src/Composer/Command/DiagnoseCommand.php ---- ./src/Composer/Command/DiagnoseCommand.php.rpm 2015-12-15 10:35:39.000000000 +0100 -+++ ./src/Composer/Command/DiagnoseCommand.php 2015-12-15 16:14:05.575860906 +0100 -@@ -132,9 +132,6 @@ EOT - $io->write('Checking disk free space: ', false); - $this->outputResult($this->checkDiskSpace($config)); +--- ./src/Composer/Command/DiagnoseCommand.php.rpm 2016-01-27 15:38:59.528897217 +0100 ++++ ./src/Composer/Command/DiagnoseCommand.php 2016-01-27 15:40:12.809253563 +0100 +@@ -137,9 +137,6 @@ EOT + $io->write('Checking pubkeys: ', false); + $this->outputResult($this->checkPubKeys($config)); - $io->write('Checking composer version: ', false); - $this->outputResult($this->checkVersion()); @@ -36,9 +36,9 @@ diff -up ./src/Composer/Command/DiagnoseCommand.php.rpm ./src/Composer/Command/D } diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2015-12-15 10:35:39.000000000 +0100 -+++ ./src/Composer/Json/JsonFile.php 2015-12-15 16:14:05.575860906 +0100 -@@ -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 15:38:59.528897217 +0100 +@@ -155,7 +155,7 @@ class JsonFile self::validateSyntax($content, $this->path); } diff --git a/composer.spec b/composer.spec index 7222dd2..02556a0 100644 --- a/composer.spec +++ b/composer.spec @@ -6,10 +6,10 @@ # # Please, preserve the changelog entries # -%global gh_commit bda2c0f9b7dfc24616fe273d06f816a61abec9ef +%global gh_commit cd21505c8d58499a9b4d38573881cfec49c51ffd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev -%global gh_date 20160109 +%global gh_date 20160127 %global gh_owner composer %global gh_project composer %global with_tests %{?_without_tests:0}%{!?_without_tests:1} @@ -221,6 +221,9 @@ rm -rf %{buildroot} %changelog +* Wed Jan 27 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.19.20160127gitcd21505 +- new snapshot + * Sun Jan 10 2016 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.19.20160109gitbda2c0f - new snapshot - raise dependency on justinrainbow/json-schema ^1.6 |