summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-04-23 15:36:32 +0200
committerRemi Collet <remi@remirepo.net>2018-04-23 15:36:32 +0200
commitd5770ee73b2d6e22b2fe1488e67d62a8e474becf (patch)
tree418b76b8cda463e739043d07fae9e8a7bc38322c
parent21c231c3053643e8f18ca05a96f0dd2af3213b4a (diff)
v5.3.2 from Fedora
* Mon Apr 23 2018 Remi Collet <remi@remirepo.net> - 5.3.2-2 - fix dependencies * Sun Apr 22 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 5.3.2-1 - Update to 5.3.2 (RHBZ #1534517) - Update get source script to save source in same directory - Add range version dependencies for Fedora >= 27 || RHEL >= 8 - Add composer.json to repo - Remove test skips
-rw-r--r--composer.json7
-rw-r--r--php-guzzlehttp-guzzle.spec74
2 files changed, 47 insertions, 34 deletions
diff --git a/composer.json b/composer.json
index 717b3be..d8bb120 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,8 @@
],
"require": {
"php": ">=5.4.0",
- "guzzlehttp/ringphp": "^1.1"
+ "guzzlehttp/ringphp": "^1.1",
+ "react/promise": "^2.2"
},
"require-dev": {
"ext-curl": "*",
@@ -29,5 +30,9 @@
"psr-4": {
"GuzzleHttp\\Tests\\": "tests/"
}
+ },
+ "scripts": {
+ "test": "make test",
+ "test-ci": "make coverage"
}
}
diff --git a/php-guzzlehttp-guzzle.spec b/php-guzzlehttp-guzzle.spec
index ce4997e..bc42a2b 100644
--- a/php-guzzlehttp-guzzle.spec
+++ b/php-guzzlehttp-guzzle.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-guzzlehttp-guzzle
#
-# Copyright (c) 2014-2017 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2014-2018 Shawn Iwinski <shawn.iwinski@gmail.com>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,21 +12,21 @@
%global github_owner guzzle
%global github_name guzzle
-%global github_version 5.3.1
-%global github_commit 70f1fa53b71c4647bf2762c09068a95f77e12fb8
+%global github_version 5.3.2
+%global github_commit f9acb4761844317e626a32259205bec1f1bc60d2
%global composer_vendor guzzlehttp
%global composer_project guzzle
# "php": ">=5.4.0"
-%global php_min_ver 5.4.0
+%global php_min_ver 5.4.0
# "guzzlehttp/ringphp": "^1.1"
# Note: Min version not "1.1" because autoloader required
-%global ring_min_ver 1.1.0-9
-%global ring_max_ver 2.0
-# "psr/log": "^1.0"
-%global psr_log_min_ver 1.0
-%global psr_log_max_ver 2.0
+%global ring_min_ver 1.1.0-9
+%global ring_max_ver 2.0
+# "react/promise": "^2.2"
+%global react_promise_min_ver 2.2
+%global react_promise_max_ver 3.0
# Build using "--without tests" to disable tests
%global with_tests 0%{!?_without_tests:1}
@@ -36,7 +36,7 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 3%{?github_release}%{?dist}
+Release: 2%{?github_release}%{?dist}
Summary: PHP HTTP client and webservice framework
Group: Development/Libraries
@@ -56,10 +56,17 @@ BuildRequires: php-composer(phpunit/phpunit)
BuildRequires: php-guzzlehttp-ringphp-tests
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(guzzlehttp/ringphp) >= %{ring_min_ver} with php-composer(guzzlehttp/ringphp) < %{ring_max_ver})
+BuildRequires: (php-composer(react/promise) >= %{react_promise_min_ver} with php-composer(react/promise) < %{react_promise_max_ver})
+%else
BuildRequires: php-composer(guzzlehttp/ringphp) < %{ring_max_ver}
#BuildRequires: php-composer(guzzlehttp/ringphp) >= %%{ring_min_ver}
BuildRequires: php-guzzlehttp-ringphp >= %{ring_min_ver}
-## phpcompatinfo (computed from version 5.3.1)
+BuildRequires: php-composer(react/promise) < %{react_promise_max_ver}
+BuildRequires: php-composer(react/promise) >= %{react_promise_min_ver}
+%endif
+## phpcompatinfo (computed from version 5.3.2)
BuildRequires: php-curl
BuildRequires: php-date
BuildRequires: php-filter
@@ -75,11 +82,18 @@ BuildRequires: php-composer(fedora/autoloader)
Requires: ca-certificates
# composer.json
-Requires: php(language) >= %{php_min_ver}
+Requires: php(language) >= %{php_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(guzzlehttp/ringphp) >= %{ring_min_ver} with php-composer(guzzlehttp/ringphp) < %{ring_max_ver})
+Requires: (php-composer(react/promise) >= %{react_promise_min_ver} with php-composer(react/promise) < %{react_promise_max_ver})
+%else
#Requires: php-composer(guzzlehttp/ringphp) >= %%{ring_min_ver}
Requires: php-guzzlehttp-ringphp >= %{ring_min_ver}
Requires: php-composer(guzzlehttp/ringphp) < %{ring_max_ver}
-# phpcompatinfo (computed from version 5.3.1)
+Requires: php-composer(react/promise) < %{react_promise_max_ver}
+Requires: php-composer(react/promise) >= %{react_promise_min_ver}
+%endif
+# phpcompatinfo (computed from version 5.3.2)
Requires: php-curl
Requires: php-date
Requires: php-filter
@@ -129,13 +143,14 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Dependencies::required(array(
'%{phpdir}/GuzzleHttp/Ring/autoload.php',
+ '%{phpdir}/React/Promise/autoload.php',
));
AUTOLOAD
%install
-mkdir -p %{buildroot}%{phpdir}/GuzzleHttp
-cp -pr src/* %{buildroot}%{phpdir}/GuzzleHttp/
+mkdir -p %{buildroot}%{phpdir}
+cp -pr src %{buildroot}%{phpdir}/GuzzleHttp
%check
@@ -152,27 +167,10 @@ sed -e "s#.*require.*autoload.*#require __DIR__ . '/autoload.php';#" \
-e "s#.*require.*Server.php.*#require '%{testsdir}/php-guzzlehttp-ringphp/autoload.php';#" \
-i tests/bootstrap.php
-%if 1
-: Skip allowed failures
-: https://github.com/guzzle/guzzle/blob/5.3.1/.travis.yml
-: https://travis-ci.org/guzzle/guzzle/builds/145548161
-sed -e 's/function testLoadsFromFileFile/function SKIP_testLoadsFromFileFile/' \
- -e 's/function testPersistsToFileFile/function SKIP_testPersistsToFileFile/' \
- -i tests/Cookie/FileCookieJarTest.php
-sed -e 's/function testLoadsFromSession/function SKIP_testLoadsFromSession/' \
- -e 's/function testPersistsToSession/function SKIP_testPersistsToSession/' \
- -i tests/Cookie/SessionCookieJarTest.php
-sed -e 's/function testParsesJsonResponses/function SKIP_testParsesJsonResponses/' \
- -e 's/function testThrowsExceptionWhenFailsToParseJsonResponse/function SKIP_testThrowsExceptionWhenFailsToParseJsonResponse/' \
- -i tests/Message/ResponseTest.php
-sed 's/function testEnsuresResponseIsPresentAfterSending/function SKIP_testEnsuresResponseIsPresentAfterSending/' \
- -i tests/ClientTest.php
-%endif
-
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit)
-for PHP_EXEC in "" %{?rhel:php55} php56 php70 php71 php72; do
+for PHP_EXEC in "" %{?rhel:php55 php56} php70 php71 php72; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1
fi
@@ -192,6 +190,16 @@ exit $RETURN_CODE
%changelog
+* Mon Apr 23 2018 Remi Collet <remi@remirepo.net> - 5.3.2-2
+- fix dependencies
+
+* Sun Apr 22 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 5.3.2-1
+- Update to 5.3.2 (RHBZ #1534517)
+- Update get source script to save source in same directory
+- Add range version dependencies for Fedora >= 27 || RHEL >= 8
+- Add composer.json to repo
+- Remove test skips
+
* Sun May 14 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 5.3.1-3
- Switch autoloader to php-composer(fedora/autoloader)
- Add max versions to build dependencies