diff options
| author | Remi Collet <remi@remirepo.net> | 2019-12-02 10:53:35 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-12-02 10:53:35 +0100 |
| commit | bc4ae0999b1883bce25bbe4a49c26a7c136d851e (patch) | |
| tree | e7a289bc43d6ca582cb46bec0176b15e72cc4f25 | |
| parent | d5770ee73b2d6e22b2fe1488e67d62a8e474becf (diff) | |
| l--------- | makesrc.sh | 1 | ||||
| -rw-r--r-- | php-guzzlehttp-guzzle.spec | 29 |
2 files changed, 19 insertions, 11 deletions
diff --git a/makesrc.sh b/makesrc.sh new file mode 120000 index 0000000..51241ed --- /dev/null +++ b/makesrc.sh @@ -0,0 +1 @@ +php-guzzlehttp-guzzle-get-source.sh
\ No newline at end of file diff --git a/php-guzzlehttp-guzzle.spec b/php-guzzlehttp-guzzle.spec index bc42a2b..17ae343 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-2018 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2014-2019 Shawn Iwinski <shawn.iwinski@gmail.com> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner guzzle %global github_name guzzle -%global github_version 5.3.2 -%global github_commit f9acb4761844317e626a32259205bec1f1bc60d2 +%global github_version 5.3.4 +%global github_commit b87eda7a7162f95574032da17e9323c9899cb6b2 %global composer_vendor guzzlehttp %global composer_project guzzle @@ -22,7 +22,7 @@ %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_min_ver 1.1.1 %global ring_max_ver 2.0 # "react/promise": "^2.2" %global react_promise_min_ver 2.2 @@ -36,10 +36,9 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: PHP HTTP client and webservice framework -Group: Development/Libraries License: MIT URL: http://guzzlephp.org @@ -61,8 +60,7 @@ BuildRequires: (php-composer(guzzlehttp/ringphp) >= %{ring_min_ver} with php-com 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} +BuildRequires: php-composer(guzzlehttp/ringphp) >= %{ring_min_ver} BuildRequires: php-composer(react/promise) < %{react_promise_max_ver} BuildRequires: php-composer(react/promise) >= %{react_promise_min_ver} %endif @@ -87,8 +85,7 @@ Requires: php(language) >= %{php_min_ver} 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_min_ver} Requires: php-composer(guzzlehttp/ringphp) < %{ring_max_ver} Requires: php-composer(react/promise) < %{react_promise_max_ver} Requires: php-composer(react/promise) >= %{react_promise_min_ver} @@ -167,10 +164,14 @@ 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 +: Skip flakey test in mock/rpmbuild environment +sed 's/function testCookiesAreExtractedFromRedirectResponses/function SKIP_testCookiesAreExtractedFromRedirectResponses/' \ + -i tests/Subscriber/CookieTest.php + : 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 php73 php74; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose || RETURN_CODE=1 fi @@ -190,6 +191,12 @@ exit $RETURN_CODE %changelog +* Sun Dec 01 2019 Shawn Iwinski <shawn.iwinski@gmail.com> - 5.3.4-1 +- Update to 5.3.4 (RHBZ #1766925) + +* Tue Oct 16 2018 Remi Collet <remi@remirepo.net> - 5.3.3-1 +- update to 5.3.3 for PHP 7.3 compatibility + * Mon Apr 23 2018 Remi Collet <remi@remirepo.net> - 5.3.2-2 - fix dependencies |