use system packages for json-schema and jsonlint

diff --git a/composer.spec b/composer.spec
index 80bc30e500aa9b931bb34612e9f098e39956017f..642dd28b54d6771d8f16f88a7d534adfa14a6497 100644 (file)
--- a/composer.spec
+++ b/composer.spec
@@ -1,4 +1,3 @@
-#
 # NOTE
 # - release tarballs: http://getcomposer.org/download/
 
@@ -7,7 +6,7 @@
 
 %define                php_min_version 5.3.4
 %define                subver  alpha8
-%define                rel             0.19
+%define                rel             0.22
 %include       /usr/lib/rpm/macros.php
 Summary:       Dependency Manager for PHP
 Name:          composer
@@ -38,6 +37,8 @@ BuildRequires:        %{name}
 Requires:      php(core) >= %{php_min_version}
 Requires:      php(hash)
 Requires:      php(phar)
+Requires:      php-justinrainbow-json-schema >= 1.1.0
+Requires:      php-seld-jsonlint >= 1.1.2
 Requires:      php-symfony2-Console >= 2.3
 Requires:      php-symfony2-Finder >= 2.2
 Requires:      php-symfony2-Process >= 2.1

diff --git a/no-bundle-symfony.patch b/no-bundle-symfony.patch
index 6a732cf9c45f70c29e0dd9cf630f866553563cfd..f87c7196a79ab7976ab032f82185b41f1396e6df 100644 (file)
--- a/no-bundle-symfony.patch
+++ b/no-bundle-symfony.patch
@@ -1,24 +1,40 @@
---- composer-master/src/Composer/Compiler.php~ 2013-04-01 22:37:46.000000000 +0300
-+++ composer-master/src/Composer/Compiler.php  2013-04-01 22:37:53.179095295 +0300
-@@ -84,7 +84,6 @@
-             ->ignoreVCS(true)
-             ->name('*.php')
-             ->exclude('Tests')
+--- composer-1.0.0-0.alpha8.0.20/src/Composer/Compiler.php~    2014-04-09 20:14:20.000000000 +0300
++++ composer-1.0.0-0.alpha8.0.20/src/Composer/Compiler.php     2014-04-09 20:14:47.969914494 +0300
+@@ -88,21 +88,6 @@
+         foreach ($finder as $file) {
+             $this->addFile($phar, $file, false);
+         }
+-        $this->addFile($phar, new \SplFileInfo(__DIR__ . '/../../src/Composer/IO/hiddeninput.exe'), false);
+-
+-        $finder = new Finder();
+-        $finder->files()
+-            ->ignoreVCS(true)
+-            ->name('*.php')
+-            ->exclude('Tests')
 -            ->in(__DIR__.'/../../vendor/symfony/')
-             ->in(__DIR__.'/../../vendor/seld/jsonlint/src/')
-             ->in(__DIR__.'/../../vendor/justinrainbow/json-schema/src/')
-         ;
---- composer-1.0.0-0.alpha8.0.18/composer.json~        2014-01-06 20:39:59.000000000 +0200
-+++ composer-1.0.0-0.alpha8.0.18/composer.json 2014-04-09 19:23:59.964432023 +0300
-@@ -24,10 +24,7 @@
+-            ->in(__DIR__.'/../../vendor/seld/jsonlint/src/')
+-            ->in(__DIR__.'/../../vendor/justinrainbow/json-schema/src/')
+-        ;
+-
+-        foreach ($finder as $file) {
+-            $this->addFile($phar, $file);
+-        }
+ 
+         $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/autoload.php'));
+         $this->addFile($phar, new \SplFileInfo(__DIR__.'/../../vendor/composer/autoload_namespaces.php'));
+--- composer-1.0.0-0.alpha8.0.20/composer.json~        2014-01-06 20:39:59.000000000 +0200
++++ composer-1.0.0-0.alpha8.0.20/composer.json 2014-04-09 20:09:41.216323385 +0300
+@@ -22,12 +22,7 @@
+         "issues": "https://github.com/composer/composer/issues"
+     },
      "require": {
-         "php": ">=5.3.2",
-         "justinrainbow/json-schema": "1.1.*",
+-        "php": ">=5.3.2",
+-        "justinrainbow/json-schema": "1.1.*",
 -        "seld/jsonlint": "1.*",
 -        "symfony/console": "~2.3",
 -        "symfony/finder": "~2.2",
 -        "symfony/process": "~2.1"
-+        "seld/jsonlint": "1.*"
++        "php": ">=5.3.2"
      },
      "require-dev": {
          "phpunit/phpunit": "~3.7.10"

diff --git a/system-symfony.patch b/system-symfony.patch
index b4d7044e812efa9fa99340d15b6a6f36d44c422d..6ef996120ccc74099f64d2194722caad6fd03ada 100644 (file)
--- a/system-symfony.patch
+++ b/system-symfony.patch
@@ -1,15 +1,17 @@
---- composer-1.0.0-0.alpha8.0.18/vendor/composer/autoload_namespaces.php~      2014-04-09 19:25:49.000000000 +0300
-+++ composer-1.0.0-0.alpha8.0.18/vendor/composer/autoload_namespaces.php       2014-04-09 19:27:08.119493444 +0300
-@@ -4,8 +4,12 @@
+--- composer-1.0.0-0.alpha8.0.20/vendor/composer/autoload_namespaces.php~      2014-04-09 20:10:11.000000000 +0300
++++ composer-1.0.0-0.alpha8.0.20/vendor/composer/autoload_namespaces.php       2014-04-09 20:12:08.796194842 +0300
+@@ -4,7 +4,14 @@
  
  $vendorDir = dirname(dirname(__FILE__));
  $baseDir = dirname($vendorDir);
 +$pearDir = PEAR_INSTALL_DIR . '/';
++$phpDir = defined('PHP_DATADIR') ? PHP_DATADIR . '/php/' : '';
  
  return array(
-+    'Symfony\\Component\\Process\\' => $pearDir,
-+    'Symfony\\Component\\Finder' => $pearDir,
-+    'Symfony\\Component\\Console\\' => $pearDir,
-     'Seld\\JsonLint' => array($vendorDir . '/seld/jsonlint/src'),
-     'JsonSchema' => array($vendorDir . '/justinrainbow/json-schema/src'),
++    'Symfony\\Component\\Process\\' => array($pearDir),
++    'Symfony\\Component\\Finder' => array($pearDir),
++    'Symfony\\Component\\Console\\' => array($pearDir),
++    'Seld\\JsonLint' => array($phpDir. '/Seld/JsonLint'),
++    'JsonSchema' => array($phpDir),
      'Composer' => array($baseDir . '/src'),
+ );