summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-09-10 07:51:46 +0200
committerRemi Collet <remi@remirepo.net>2019-09-10 07:51:46 +0200
commit2ae7ff0ddeff335999c1efecdb4a5bead14d5234 (patch)
treecf8f9c7664cf64d46dd9d1ec2c0db96080990f8e
parentd31fd324fde74f4f9b6f9bf376a2c9a12536b90c (diff)
sync with fedoraHEADmaster
-rw-r--r--php-guzzle-Guzzle.spec11
1 files changed, 8 insertions, 3 deletions
diff --git a/php-guzzle-Guzzle.spec b/php-guzzle-Guzzle.spec
index 8903818..4ab7c87 100644
--- a/php-guzzle-Guzzle.spec
+++ b/php-guzzle-Guzzle.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-guzzle-Guzzle
#
-# Copyright (c) 2012-2018 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2012-2019 Shawn Iwinski <shawn.iwinski@gmail.com>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -53,7 +53,7 @@
Name: php-guzzle-%{pear_name}
Version: %{github_version}
-Release: 17%{?dist}
+Release: 21%{?dist}
Summary: PHP HTTP client library and framework for building RESTful web service clients
Group: Development/Libraries
@@ -294,6 +294,8 @@ AUTOLOAD
: Skip tests known to fail
sed 's/function testAddsBody/function SKIP_testAddsBody/' \
-i tests/Guzzle/Tests/Stream/PhpStreamRequestFactoryTest.php
+sed 's/function testAddsCookiesFromResponseWithNoRequest/function SKIP_testAddsCookiesFromResponseWithNoRequest/' \
+ -i tests/Guzzle/Tests/Plugin/Cookie/CookieJar/ArrayCookieJarTest.php
%if 0%{?fedora}
sed \
-e 's/function testCalculatesAge/function SKIP_testCalculatesAge/' \
@@ -336,7 +338,7 @@ sed 's/function testMustReturnRequest/function SKIP_testMustReturnRequest/' \
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit)
-for PHP_EXEC in "" %{?rhel:php54 php55 php56} php70 php71 php72; do
+for PHP_EXEC in "" %{?rhel:php54 php55 php56 php70} php71 php72; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1
fi
@@ -370,6 +372,9 @@ fi
%changelog
+* Sun Sep 08 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.9.3-21
+- Fix FTBFS (RHBZ #1736431)
+
* Mon May 28 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.9.3-17
- Fix typo