[packages/composer] update building with system symfony
glen
glen at pld-linux.org
Thu Jun 13 10:32:19 CEST 2013
commit 89da5e62de4328966e7a4403197bd13a6582e61a
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Apr 12 18:43:30 2013 +0300
update building with system symfony
composer.spec | 7 +++++--
system-symfony.patch | 17 +++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/composer.spec b/composer.spec
index 0e43894..882ee22 100644
--- 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 30fc654..892452e 100644
--- 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/',
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/composer.git/commitdiff/89da5e62de4328966e7a4403197bd13a6582e61a
More information about the pld-cvs-commit
mailing list