From 0996ad0da65861ddd75fc2d862defaaa4ccf551d Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 26 May 2015 15:46:33 +0200
Subject: composer-1.0.0-0.5.20150525git69210d5

---
 composer-rpm.patch | 26 +++++++++++++++-----------
 composer.spec      | 14 +++++++++-----
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/composer-rpm.patch b/composer-rpm.patch
index c40e7ef..548ff70 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,20 +1,24 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2015-02-25 20:44:34.000000000 +0100
-+++ ./bin/composer	2015-02-26 10:25:16.012610034 +0100
-@@ -1,11 +1,11 @@
--#!/usr/bin/env php
-+#!/usr/bin/env php
- <?php
- 
- if (PHP_SAPI !== 'cli') {
+--- ./bin/composer.rpm	2015-05-25 15:29:26.000000000 +0200
++++ ./bin/composer	2015-05-26 15:36:46.984350206 +0200
+@@ -5,7 +5,16 @@ if (PHP_SAPI !== 'cli') {
      echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
  }
- 
+
 -require __DIR__.'/../src/bootstrap.php';
++// Ensure correct include_path for RHSCL
++$inc = get_include_path();
++$dirs = explode(':', $inc);
++if (!in_array('/usr/share/php', $dirs)) {
++    $dirs[] = '/usr/share/php';
++    set_include_path(implode(':', $dirs));
++}
++unset ($inc, $dirs);
++
 +require 'Composer/autoload.php';
- 
+
  use Composer\Console\Application;
- 
+
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
 --- ./src/Composer/Json/JsonFile.php.rpm	2015-02-25 20:44:34.000000000 +0100
 +++ ./src/Composer/Json/JsonFile.php	2015-02-26 10:25:16.012610034 +0100
diff --git a/composer.spec b/composer.spec
index 4beb9f6..f62aa6f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,17 +6,17 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    bc45d9185513575434021527d7756420e9f4b2cf
+%global gh_commit    69210d5bc130f8cc9f96f99582a041254d7b9833
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
-%global gh_date      20150511
+%global gh_date      20150525
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
 Name:           composer
 Version:        1.0.0
-Release:        0.4.%{gh_date}git%{gh_short}%{?dist}
+Release:        0.5.%{gh_date}git%{gh_short}%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -26,7 +26,7 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 Source1:        %{name}-autoload.php
 Source2:        %{name}-bootstrap.php
 
-# Fix shebang and use our autoloader
+# Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -143,7 +143,7 @@ install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 %if %{with_tests}
 : Run test suite
 export BUILDROOT=%{buildroot}
-%{_bindir}/phpunit --include-path $PWD/src
+%{_bindir}/phpunit --include-path $PWD/src --verbose
 %else
 : Test suite disabled
 %endif
@@ -164,6 +164,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May 26 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.5.20150525git69210d5
+- new snapshot
+- ensure /usr/share/php is in include_path (for SCL)
+
 * Wed May 13 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.4.20150511gitbc45d91
 - new snapshot
 
-- 
cgit