summaryrefslogtreecommitdiffstats
path: root/php-guzzlehttp-guzzle6.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2016-05-30 07:30:34 +0200
committerRemi Collet <fedora@famillecollet.com>2016-05-30 07:30:34 +0200
commit7e20ebe8e9752e1a281f61a4625c31ab6c7b86b4 (patch)
tree04c0121e917f721f08a14129fee01e8ee34720bb /php-guzzlehttp-guzzle6.spec
parent997d62fce4bff92c1c0ee5eec4b64ea39b50bf4f (diff)
php-guzzlehttp-guzzle6: pull Fedora changes
Diffstat (limited to 'php-guzzlehttp-guzzle6.spec')
-rw-r--r--php-guzzlehttp-guzzle6.spec13
1 files changed, 12 insertions, 1 deletions
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 <shawn@iwin.ski> - 6.2.0-3
+- Fix failing test
+
* Fri Apr 15 2016 Remi Collet <remi@remirepo.net> - 6.2.0-2.1
- fix dep. on EL-5