up to 1.4.1

diff --git a/autoload.patch b/autoload.patch
index cc85247f3bfd61fc3f2788febbfcecfdd3e8ba93..4e21c3d8a1a3df839b99d02a7f61de7fa5e9399b 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -13,17 +13,17 @@
  
  use Composer\Console\Application;
  
---- composer-1.0.0-14.alpha11/src/Composer/Json/JsonFile.php~  2015-11-25 23:45:44.000000000 +0200
-+++ composer-1.0.0-14.alpha11/src/Composer/Json/JsonFile.php   2015-11-25 23:45:49.118198863 +0200
-@@ -149,7 +149,7 @@
+--- composer-1.4.1/src/Composer/Json/JsonFile.php~     2017-03-10 10:29:45.000000000 +0200
++++ composer-1.4.1/src/Composer/Json/JsonFile.php      2017-03-28 13:37:49.762829930 +0300
+@@ -156,7 +156,7 @@
              self::validateSyntax($content, $this->path);
          }
  
 -        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
 +        $schemaFile = __DIR__ . '/../res/composer-schema.json';
-         $schemaData = json_decode(file_get_contents($schemaFile));
  
-         if ($schema === self::LAX_SCHEMA) {
+         // Prepend with file:// only when not using a special schema already (e.g. in the phar)
+         if (false === strpos($schemaFile, '://')) {
 --- composer-1.0.0-15.alpha11/src/Composer/Autoload/AutoloadGenerator.php~     2015-11-14 18:21:07.000000000 +0200
 +++ composer-1.0.0-15.alpha11/src/Composer/Autoload/AutoloadGenerator.php      2015-11-26 14:52:01.344498517 +0200
 @@ -275,7 +275,7 @@

diff --git a/composer.spec b/composer.spec
index 34aea31a969568fc8d4508eb803b4ca3612bce77..7d1cc574d0a1b8c9ba5b4bdc7f926fb3fbae186f 100644 (file)
--- a/composer.spec
+++ b/composer.spec
@@ -6,12 +6,12 @@
 %include       /usr/lib/rpm/macros.php
 Summary:       Dependency Manager for PHP
 Name:          composer
-Version:       1.3.0
+Version:       1.4.1
 Release:       1
 License:       MIT
 Group:         Development/Languages/PHP
 Source0:       https://github.com/composer/composer/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a037e39829060b52b5c947e855c89be9
+# Source0-md5: 1c336fab95612c2c888bd61bbacccac5
 Source2:       https://raw.githubusercontent.com/iArren/%{name}-bash-completion/86a8129/composer
 # Source2-md5: cdeebf0a0da1fd07d0fd886d0461642e
 Source3:       autoload.php
@@ -47,7 +47,7 @@ Requires:     php(zlib)
 Requires:      php-composer-ca-bundle >= 1.0.2
 Requires:      php-composer-semver >= 1.0.0
 Requires:      php-composer-spdx-licenses >= 1.0.0
-Requires:      php-justinrainbow-json-schema >= 1.6
+Requires:      php-justinrainbow-json-schema >= 3.0
 Requires:      php-psr-Log >= 1.0
 Requires:      php-seld-cli-prompt >= 1.0.0
 Requires:      php-seld-jsonlint >= 1.4