summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer-rpm.patch13
-rw-r--r--composer.spec7
2 files changed, 7 insertions, 13 deletions
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 548ff70..858abb1 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,21 +1,12 @@
diff -up ./bin/composer.rpm ./bin/composer
--- ./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') {
+@@ -5,7 +5,7 @@ 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';
++require '/usr/share/php/Composer/autoload.php';
use Composer\Console\Application;
diff --git a/composer.spec b/composer.spec
index de48fb2..e5fc86f 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,10 +6,10 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 9fb2d4f2d642a0749decb41bc2fe4be2bf8bef7a
+%global gh_commit 8e9659bd8317ad3f623c4d17940380443cf8772c
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
-%global gh_date 20150605
+%global gh_date 20150614
%global gh_owner composer
%global gh_project composer
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
@@ -164,6 +164,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jun 15 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.5.20150614git8e9659b
+- new snapshot
+
* Sun Jun 7 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.5.20150605git9fb2d4f
- new snapshot