From 7e20ebe8e9752e1a281f61a4625c31ab6c7b86b4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 May 2016 07:30:34 +0200 Subject: php-guzzlehttp-guzzle6: pull Fedora changes --- php-guzzlehttp-guzzle6.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'php-guzzlehttp-guzzle6.spec') diff --git a/php-guzzlehttp-guzzle6.spec b/php-guzzlehttp-guzzle6.spec index 445dc3b..3aa5070 100644 --- a/php-guzzlehttp-guzzle6.spec +++ b/php-guzzlehttp-guzzle6.spec @@ -44,7 +44,7 @@ Name: php-%{composer_vendor}-%{composer_project}6 Version: %{github_version} -Release: 2%{?github_release}%{?dist}.1 +Release: 3%{?github_release}%{?dist} Summary: PHP HTTP client library Group: Development/Libraries @@ -56,6 +56,11 @@ URL: http://guzzlephp.org Source0: %{name}-%{github_version}-%{github_commit}.tar.gz Source1: %{name}-get-source.sh +# Fixing failing test +# https://github.com/guzzle/guzzle/issues/1470 +# https://github.com/guzzle/guzzle/commit/0d082d5714082d5c9e414e076507e883ccbf9f96 +Patch0: %{name}-0d082d5714082d5c9e414e076507e883ccbf9f96.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Tests @@ -131,6 +136,9 @@ Autoloader: %{phpdir}/GuzzleHttp6/autoload.php %prep %setup -qn %{github_name}-%{github_commit} +: Fix failing test +%patch0 -p1 + %build : Create common autoloader @@ -210,6 +218,9 @@ rm -rf %{buildroot} %changelog +* Sun May 29 2016 Shawn Iwinski - 6.2.0-3 +- Fix failing test + * Fri Apr 15 2016 Remi Collet - 6.2.0-2.1 - fix dep. on EL-5 -- cgit