composer-1.0.0-0.5.20150620gitd0ff016

2 files changed, 36 insertions, 2 deletions

diff --git a/composer-pr4169.patch b/composer-pr4169.patch
new file mode 100644
index 0000000..dc419c2
--- /dev/null
+++ b/composer-pr4169.patch
@@ -0,0 +1,23 @@
+From c350bceeea660f49f92f033170aea35fae7333f2 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@famillecollet.com>
+Date: Sun, 21 Jun 2015 07:46:08 +0200
+Subject: [PATCH] Set this test as slow
+
+---
+ tests/Composer/Test/Util/RemoteFilesystemTest.php | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/Composer/Test/Util/RemoteFilesystemTest.php b/tests/Composer/Test/Util/RemoteFilesystemTest.php
+index 04502eb..62a70c9 100644
+--- a/tests/Composer/Test/Util/RemoteFilesystemTest.php
++++ b/tests/Composer/Test/Util/RemoteFilesystemTest.php
+@@ -137,6 +137,9 @@ public function testCallbackGetPassesThrough404()
+         $this->assertNull($this->callCallbackGet($fs, STREAM_NOTIFY_FAILURE, 0, 'HTTP/1.1 404 Not Found', 404, 0, 0));
+     }
+ 
++    /**
++     * @group slow
++     */
+     public function testCaptureAuthenticationParamsFromUrl()
+     {
+         $io = $this->getMock('Composer\IO\IOInterface');
diff --git a/composer.spec b/composer.spec
index e5fc86f..ac32955 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,10 +6,10 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    8e9659bd8317ad3f623c4d17940380443cf8772c
+%global gh_commit    d0ff01698de0eb74e45ebe379b6ac8ccd5a6b0db
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
-%global gh_date      20150614
+%global gh_date      20150620
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
@@ -28,6 +28,9 @@ Source2:        %{name}-bootstrap.php
 
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
+# https://github.com/composer/composer/pull/4169
+# skip online tests
+Patch1:         %{name}-pr4169.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -39,6 +42,7 @@ BuildRequires:  php-composer(symfony/finder)            >= 2.2
 BuildRequires:  php-composer(symfony/process)           >= 2.1
 BuildRequires:  php-composer(symfony/class-loader)
 BuildRequires:  %{_bindir}/phpunit
+BuildRequires:  php-zip
 %endif
 
 # From composer.json, requires
@@ -107,6 +111,8 @@ Documentation: https://getcomposer.org/doc/
 %setup -q -n %{gh_project}-%{gh_commit}
 
 %patch0 -p1 -b .rpm
+%patch1 -p1 -b .pr4169
+
 cp -p %{SOURCE1} src/Composer/autoload.php
 cp -p %{SOURCE2} tests/bootstrap.php
 rm src/bootstrap.php
@@ -164,6 +170,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jun 21 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.5.20150620gitd0ff016
+- new snapshot
+- add missing BR on php-zip
+- open https://github.com/composer/composer/pull/4169 for online test
+
 * Mon Jun 15 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.5.20150614git8e9659b
 - new snapshot