diff options
| -rw-r--r-- | composer-pr4169.patch | 23 | ||||
| -rw-r--r-- | composer.spec | 11 |
2 files changed, 5 insertions, 29 deletions
diff --git a/composer-pr4169.patch b/composer-pr4169.patch deleted file mode 100644 index 46a47d3..0000000 --- a/composer-pr4169.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 -@@ -136,6 +136,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 04b8cc5..b4c6bb4 100644 --- a/composer.spec +++ b/composer.spec @@ -6,10 +6,10 @@ # # Please, preserve the changelog entries # -%global gh_commit 00c26791faeb83da8476b54bcc20596cf754362e +%global gh_commit c83650f299cfff1049cd61ea72ee5345bd4f92d3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev -%global gh_date 20150720 +%global gh_date 20150804 %global gh_owner composer %global gh_project composer %global with_tests %{?_without_tests:0}%{!?_without_tests:1} @@ -28,9 +28,6 @@ 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 @@ -115,7 +112,6 @@ Documentation: https://getcomposer.org/doc/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -%patch1 -p1 cp -p %{SOURCE1} src/Composer/autoload.php cp -p %{SOURCE2} tests/bootstrap.php @@ -175,6 +171,9 @@ rm -rf %{buildroot} %changelog +* Fri Aug 7 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.8.20150804gitc83650f +- new snapshot + * Tue Jul 21 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0.8.20150720git00c2679 - new snapshot - add dependency on composer/spdx-licenses |