diff options
author | Remi Collet <fedora@famillecollet.com> | 2015-07-21 09:03:33 +0200 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2015-07-21 09:03:33 +0200 |
commit | fa5aed5918ee7e8b94cc60fee7f7e7caedc09f2e (patch) | |
tree | c013910e62267edffd481c0cf77909b2ca9506ad /composer-rpm.patch | |
parent | 1b145b67a216f4b3d5dfd88cce9019e506127bab (diff) |
composer-1.0.0-0.8.20150720git00c2679
Diffstat (limited to 'composer-rpm.patch')
-rw-r--r-- | composer-rpm.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch index 52d26ad..d53705a 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -22,24 +22,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/Util/SpdxLicense.php.rpm ./src/Composer/Util/SpdxLicense.php ---- ./src/Composer/Util/SpdxLicense.php.rpm 2015-07-16 08:58:33.415021590 +0200 -+++ ./src/Composer/Util/SpdxLicense.php 2015-07-16 08:59:36.006332340 +0200 -@@ -167,7 +167,7 @@ class SpdxLicense - return $this->licenses; - } - -- $jsonFile = file_get_contents(__DIR__ . '/../../../res/spdx-licenses.json'); -+ $jsonFile = file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json'); - $this->licenses = json_decode($jsonFile, true); - - return $this->licenses; -@@ -182,7 +182,7 @@ class SpdxLicense - return $this->exceptions; - } - -- $jsonFile = file_get_contents(__DIR__ . '/../../../res/spdx-exceptions.json'); -+ $jsonFile = file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-exceptions.json'); - $this->exceptions = json_decode($jsonFile, true); - - return $this->exceptions; |