diff options
| -rw-r--r-- | php-guzzle-Guzzle.spec | 54 |
1 files changed, 41 insertions, 13 deletions
diff --git a/php-guzzle-Guzzle.spec b/php-guzzle-Guzzle.spec index 7f3e766..e4dce93 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-2017 Shawn Iwinski <shawn.iwinski@gmail.com> +# Copyright (c) 2012-2018 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: 14%{?dist} +Release: 17%{?dist} Summary: PHP HTTP client library and framework for building RESTful web service clients Group: Development/Libraries @@ -72,22 +72,32 @@ BuildArch: noarch %if %{with_tests} BuildRequires: nodejs ## composer.json -BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} -BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} -BuildRequires: php-composer(monolog/monolog) >= %{monolog_min_ver} -BuildRequires: php-composer(monolog/monolog) < %{monolog_max_ver} +BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) -BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} -BuildRequires: php-composer(psr/log) < %{psr_log_max_ver} -BuildRequires: php-composer(symfony/class-loader) >= %{symfony_min_ver} -BuildRequires: php-composer(symfony/class-loader) < %{symfony_max_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) < %{doctrine_cache_max_ver}) +BuildRequires: (php-composer(monolog/monolog) >= %{monolog_min_ver} with php-composer(monolog/monolog) < %{monolog_max_ver}) +BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) +BuildRequires: (php-composer(symfony/class-loader) >= %{symfony_min_ver} with php-composer(symfony/class-loader) < %{symfony_max_ver}) +BuildRequires: (php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} with php-composer(symfony/event-dispatcher) < %{symfony_max_ver}) +BuildRequires: (php-composer(zendframework/zend-cache) >= %{zend_min_ver} with php-composer(zendframework/zend-cache) < %{zend_max_ver}) +BuildRequires: (php-composer(zendframework/zend-log) >= %{zend_min_ver} with php-composer(zendframework/zend-log) < %{zend_max_ver}) +%else +BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} +BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver} +BuildRequires: php-composer(monolog/monolog) >= %{monolog_min_ver} +BuildRequires: php-composer(monolog/monolog) < %{monolog_max_ver} +BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} +BuildRequires: php-composer(psr/log) < %{psr_log_max_ver} +BuildRequires: php-composer(symfony/class-loader) >= %{symfony_min_ver} +BuildRequires: php-composer(symfony/class-loader) < %{symfony_max_ver} BuildRequires: php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} BuildRequires: php-composer(symfony/event-dispatcher) < %{symfony_max_ver} BuildRequires: php-composer(zendframework/zend-cache) >= %{zend_min_ver} BuildRequires: php-composer(zendframework/zend-cache) < %{zend_max_ver} -BuildRequires: php-composer(zendframework/zend-log) >= %{zend_min_ver} -BuildRequires: php-composer(zendframework/zend-log) < %{zend_max_ver} +BuildRequires: php-composer(zendframework/zend-log) >= %{zend_min_ver} +BuildRequires: php-composer(zendframework/zend-log) < %{zend_max_ver} +%endif BuildRequires: php-curl ## phpcompatinfo (computed from version 3.9.3) BuildRequires: php-ctype @@ -109,8 +119,12 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} with php-composer(symfony/event-dispatcher) < %{symfony_max_ver}) +%else Requires: php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} Requires: php-composer(symfony/event-dispatcher) < %{symfony_max_ver} +%endif Requires: php-curl # phpcompatinfo (computed from version 3.9.3) Requires: php-ctype @@ -243,7 +257,14 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::optional(array( '%{phpdir}/Doctrine/Common/Cache/autoload.php', '%{phpdir}/Monolog/autoload.php', + %if !0%{?el6} + %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 + '%{phpdir}/Zend/Cache/autoload.php', + '%{phpdir}/Zend/Log/autoload.php', + %else '%{phpdir}/Zend/autoload.php', + %endif + %endif )); AUTOLOAD @@ -351,6 +372,13 @@ fi %changelog +* Mon May 28 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.9.3-17 +- Fix typo + +* Mon May 28 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.9.3-16 +- Fix FTBS (RHBZ #1556114) +- Add range version dependencies for Fedora >= 27 || RHEL >= 8 + * Thu Nov 9 2017 Remi Collet <remi@remirepo.net> - 3.9.3-14 - fix FTBFS from Koschei, add patch for PHP 7.2 |