diff options
| author | Remi Collet <remi@remirepo.net> | 2017-04-30 07:05:06 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-04-30 07:05:06 +0200 |
| commit | 5263ea1e7c4401abdfa33806f567b3175427141d (patch) | |
| tree | c7a7e88e3fca3dc87ca3a5b4bbee94058806cbe4 | |
| parent | 4af77da83b9b206d6ca67c3c63fa9a6998848845 (diff) | |
v0.4.8 (backported from Fedora)
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | php-react-dns.spec | 23 |
2 files changed, 23 insertions, 10 deletions
@@ -1,3 +1,7 @@ -/php-react-dns-0.4.3-751b3129556e04944f164e3556a20ca6e201e459.tar.gz -/php-react-dns-0.4.6-a4c32f0021c742a1781c445270cb29a2d4b76fed.tar.gz -/php-react-dns-0.4.7-e09ca286e3e18fea93317315dd7fc59d7963af8a.tar.gz +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/php-react-dns.spec b/php-react-dns.spec index 23dc79c..0d650b6 100644 --- a/php-react-dns.spec +++ b/php-react-dns.spec @@ -12,8 +12,8 @@ %global github_owner reactphp %global github_name dns -%global github_version 0.4.7 -%global github_commit e09ca286e3e18fea93317315dd7fc59d7963af8a +%global github_version 0.4.8 +%global github_commit 86d3da64ebfbecddf6b940c6e69daa67c0f21a05 %global composer_vendor react %global composer_project dns @@ -68,7 +68,7 @@ BuildRequires: php-composer(react/socket) < %{react_socket_max_ver} BuildRequires: php-composer(react/socket) >= %{react_socket_min_ver} BuildRequires: php-composer(react/stream) < %{react_stream_max_ver} BuildRequires: php-composer(react/stream) >= %{react_stream_min_ver} -## phpcompatinfo (computed from version 0.4.7) +## phpcompatinfo (computed from version 0.4.8) BuildRequires: php-date BuildRequires: php-pcre BuildRequires: php-reflection @@ -89,7 +89,7 @@ Requires: php-composer(react/socket) < %{react_socket_max_ver} Requires: php-composer(react/socket) >= %{react_socket_min_ver} Requires: php-composer(react/stream) < %{react_stream_max_ver} Requires: php-composer(react/stream) >= %{react_stream_min_ver} -# phpcompatinfo (computed from version 0.4.7) +# phpcompatinfo (computed from version 0.4.8) Requires: php-date Requires: php-pcre Requires: php-spl @@ -155,12 +155,18 @@ sed 's/function testResolveGoogleResolves/function SKIP_testResolveGoogleResolve : Upstream tests RETURN_CODE=0 -for PHP_EXEC in php %{?rhel:php54 php55} php56 php70 php71; do - if which $PHP_EXEC; then - if $PHP_EXEC -r 'exit (PHP_VERSION_ID >= 70100 ? 0 : 1);' ; then +for PHP_EXEC in php %{?rhel:php54 php55} php56 php70 php71 php72; do + if [ "php" = "$PHP_EXEC" ] || which $PHP_EXEC; then + if [ $($PHP_EXEC -r 'echo (PHP_VERSION_ID >= 70100 ? 1 : 0);') ]; then : Skip tests known to fail : See https://github.com/reactphp/dns/issues/55 : See https://github.com/reactphp/dns/pull/56 + + # Allow multiple runs of this conditional logic + [ -e tests/Query/ExecutorTest.php.dist ] && \ + mv tests/Query/ExecutorTest.php.dist tests/Query/ExecutorTest.php + cp tests/Query/ExecutorTest.php tests/Query/ExecutorTest.php.dist + # These test functions do not start with "test" and instead are marked with "/** @test */" for FUNC in \ resolveShouldRetryWithTcpIfResponseIsTruncated \ @@ -193,6 +199,9 @@ exit $RETURN_CODE %changelog +* Sat Apr 29 2017 Shawn Iwinski <shawn@iwin.ski> - 0.4.8-1 +- Update to 0.4.8 (RHBZ #1443522) + * Sun Apr 02 2017 Shawn Iwinski <shawn@iwin.ski> - 0.4.7-1 - Update to 0.4.7 (RHBZ #1421888) |