update building with system symfony

diff --git a/composer.spec b/composer.spec
index 0e4389415dd7fbe55aaf141b2742c0c7ea3ff3cc..882ee2223f93a63080235e5455850bd185abf599 100644 (file)
--- a/composer.spec
+++ b/composer.spec
@@ -7,7 +7,7 @@
 
 %define                php_min_version 5.3.4
 %define                subver  alpha7
-%define                rel             0.13
+%define                rel             0.14
 %include       /usr/lib/rpm/macros.php
 Summary:       Dependency Manager for PHP
 Name:          composer
@@ -30,6 +30,7 @@ BuildRequires:        php(hash)
 BuildRequires: php(json)
 BuildRequires: php(openssl)
 BuildRequires: php(phar)
+BuildRequires: php(zip)
 BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.461
 %if %{without bootstrap}
@@ -60,15 +61,17 @@ mv composer-composer-*/* .
 %patch0 -p1
 %patch1 -p1
 
+mv composer.lock{,.disabled}
 %{__sed} -i -e '1s,^#!.*env php,#!%{__php},' bin/*
 
 %build
 %if %{with bootstrap}
-composer='env -i PATH="$PATH" %{__php} %{SOURCE1}'
+composer='%{__php} %{SOURCE1}'
 %else
 composer=composer
 %endif
 if [ ! -d vendor ]; then
+       COMPOSER_HOME=${PWD:=$(pwd)} \
        $composer install --prefer-dist -v
        %{__patch} -p1 < %{PATCH2}
 fi

diff --git a/system-symfony.patch b/system-symfony.patch
index 30fc654046968960e92e14deb9c269f1fb86ae13..892452e81ad918a6f9646f1f44526964cca67d55 100644 (file)
--- a/system-symfony.patch
+++ b/system-symfony.patch
@@ -1,18 +1,15 @@
---- ./vendor/composer/autoload_namespaces.php~ 2013-04-01 22:50:46.954794399 +0300
-+++ ./vendor/composer/autoload_namespaces.php  2013-04-01 22:53:05.747864077 +0300
-@@ -4,11 +4,12 @@
+--- composer-1.0.0/vendor/composer/autoload_namespaces.php~    2013-04-12 18:41:14.000000000 +0300
++++ composer-1.0.0/vendor/composer/autoload_namespaces.php     2013-04-12 18:42:10.735493349 +0300
+@@ -4,8 +4,12 @@
  
  $vendorDir = dirname(dirname(__FILE__));
  $baseDir = dirname($vendorDir);
-+$phpDir = PEAR_INSTALL_DIR . '/';
++$pearDir = PEAR_INSTALL_DIR . '/';
  
  return array(
--    'Symfony\\Component\\Process\\' => $vendorDir . '/symfony/process/',
--    'Symfony\\Component\\Finder' => $vendorDir . '/symfony/finder/',
--    'Symfony\\Component\\Console\\' => $vendorDir . '/symfony/console/',
-+    'Symfony\\Component\\Process\\' => $phpDir,
-+    'Symfony\\Component\\Finder' => $phpDir,
-+    'Symfony\\Component\\Console\\' => $phpDir,
++    'Symfony\\Component\\Process\\' => $pearDir,
++    'Symfony\\Component\\Finder' => $pearDir,
++    'Symfony\\Component\\Console\\' => $pearDir,
      'Seld\\JsonLint' => $vendorDir . '/seld/jsonlint/src/',
      'JsonSchema' => $vendorDir . '/justinrainbow/json-schema/src/',
      'Composer' => $baseDir . '/src/',