Projects
home:tpokorra:branches:Kolab:Winterfell
composer
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 4
View file
composer.spec
Changed
@@ -15,7 +15,7 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: composer -Version: 1.4.2 +Version: 1.2.4 Release: 0.1.%{gh_date}git%{gh_short}%{?dist} Summary: Dependency Manager for PHP
View file
composer-rpm.patch
Changed
@@ -1,24 +1,43 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2015-02-25 20:44:34.000000000 +0100 -+++ ./bin/composer 2015-02-26 10:25:16.012610034 +0100 -@@ -1,11 +1,11 @@ --#!/usr/bin/env php -+#!/usr/bin/env php - <?php - - if (PHP_SAPI !== 'cli') { +--- ./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; } -require __DIR__.'/../src/bootstrap.php'; -+require 'Composer/autoload.php'; ++require '/usr/share/php/Composer/autoload.php'; 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-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'); ++ $this->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE'); + + 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 +@@ -97,7 +97,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) + ; diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2015-02-25 20:44:34.000000000 +0100 -+++ ./src/Composer/Json/JsonFile.php 2015-02-26 10:25:16.012610034 +0100 -@@ -149,7 +149,7 @@ class JsonFile +--- ./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); } @@ -27,38 +46,15 @@ $schemaData = json_decode(file_get_contents($schemaFile)); if ($schema === self::LAX_SCHEMA) { -diff -up src/Composer/Util/SpdxLicense.php.old src/Composer/Util/SpdxLicense.php ---- ./src/Composer/Util/SpdxLicense.php.old 2015-04-17 09:57:53.680999733 +0200 -+++ ./src/Composer/Util/SpdxLicense.php 2015-04-17 09:59:50.397498276 +0200 -@@ -38,7 +38,7 @@ class SpdxLicense - return $this->licenses; - } - -- $jsonFile = new JsonFile(__DIR__ . '/../../../res/spdx-licenses.json'); -+ $jsonFile = new JsonFile((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json'); - $this->licenses = $jsonFile->read(); - - return $this->licenses; -diff -up src/Composer/Util/SpdxLicensesUpdater.php.old src/Composer/Util/SpdxLicensesUpdater.php ---- ./src/Composer/Util/SpdxLicensesUpdater.php.old 2015-04-17 09:58:00.645029479 +0200 -+++ ./src/Composer/Util/SpdxLicensesUpdater.php 2015-04-17 10:00:36.578695534 +0200 -@@ -28,7 +28,7 @@ class SpdxLicensesUpdater - { - $json = json_encode($this->getLicenses(), true); - $prettyJson = JsonFormatter::format($json, true, true); -- file_put_contents(__DIR__ . '/../../../res/spdx-licenses.json', $prettyJson); -+ file_put_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json', $prettyJson); - } - - private function getLicenses() -diff -up ./tests/Composer/Test/Json/JsonFileTest.php.rpm ./tests/Composer/Test/Json/JsonFileTest.php ---- ./tests/Composer/Test/Json/JsonFileTest.php.rpm 2015-02-26 10:26:10.607821640 +0100 -+++ ./tests/Composer/Test/Json/JsonFileTest.php 2015-02-26 10:27:05.430034125 +0100 -@@ -54,6 +54,7 @@ class JsonFileTest extends \PHPUnit_Fram +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 - public function testParseErrorDetectSingleQuotes() + private function check($json) { -+ $this->markTestSkipped('jsonc issue'); - $json = '{ - \'foo\': "bar" - }'; +- $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); +
View file
debian.tar.gz/patches/composer-deb.patch
Changed
@@ -1,24 +1,43 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2015-02-25 20:44:34.000000000 +0100 -+++ ./bin/composer 2015-02-26 10:25:16.012610034 +0100 -@@ -1,11 +1,11 @@ --#!/usr/bin/env php -+#!/usr/bin/env php - <?php - - if (PHP_SAPI !== 'cli') { +--- ./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; } -require __DIR__.'/../src/bootstrap.php'; -+require 'Composer/autoload.php'; ++require '/usr/share/php/Composer/autoload.php'; 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-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'); ++ $this->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE'); + + 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 +@@ -97,7 +97,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) + ; diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2015-02-25 20:44:34.000000000 +0100 -+++ ./src/Composer/Json/JsonFile.php 2015-02-26 10:25:16.012610034 +0100 -@@ -149,7 +149,7 @@ class JsonFile +--- ./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); } @@ -27,38 +46,15 @@ $schemaData = json_decode(file_get_contents($schemaFile)); if ($schema === self::LAX_SCHEMA) { -diff -up src/Composer/Util/SpdxLicense.php.old src/Composer/Util/SpdxLicense.php ---- ./src/Composer/Util/SpdxLicense.php.old 2015-04-17 09:57:53.680999733 +0200 -+++ ./src/Composer/Util/SpdxLicense.php 2015-04-17 09:59:50.397498276 +0200 -@@ -38,7 +38,7 @@ class SpdxLicense - return $this->licenses; - } - -- $jsonFile = new JsonFile(__DIR__ . '/../../../res/spdx-licenses.json'); -+ $jsonFile = new JsonFile((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json'); - $this->licenses = $jsonFile->read(); - - return $this->licenses; -diff -up src/Composer/Util/SpdxLicensesUpdater.php.old src/Composer/Util/SpdxLicensesUpdater.php ---- ./src/Composer/Util/SpdxLicensesUpdater.php.old 2015-04-17 09:58:00.645029479 +0200 -+++ ./src/Composer/Util/SpdxLicensesUpdater.php 2015-04-17 10:00:36.578695534 +0200 -@@ -28,7 +28,7 @@ class SpdxLicensesUpdater - { - $json = json_encode($this->getLicenses(), true); - $prettyJson = JsonFormatter::format($json, true, true); -- file_put_contents(__DIR__ . '/../../../res/spdx-licenses.json', $prettyJson); -+ file_put_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json', $prettyJson); - } - - private function getLicenses() -diff -up ./tests/Composer/Test/Json/JsonFileTest.php.rpm ./tests/Composer/Test/Json/JsonFileTest.php ---- ./tests/Composer/Test/Json/JsonFileTest.php.rpm 2015-02-26 10:26:10.607821640 +0100 -+++ ./tests/Composer/Test/Json/JsonFileTest.php 2015-02-26 10:27:05.430034125 +0100 -@@ -54,6 +54,7 @@ class JsonFileTest extends \PHPUnit_Fram +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 - public function testParseErrorDetectSingleQuotes() + private function check($json) { -+ $this->markTestSkipped('jsonc issue'); - $json = '{ - \'foo\': "bar" - }'; +- $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); +
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.