diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-zendframework-zend-servicemanager.spec | 49 |
2 files changed, 42 insertions, 9 deletions
diff --git a/composer.json b/composer.json index 8b18187..f49c7d7 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "php": "^5.6 || ^7.0", "container-interop/container-interop": "^1.2", "psr/container": "^1.0", - "zendframework/zend-stdlib": "^3.1" + "zendframework/zend-stdlib": "^3.2.1" }, "require-dev": { "mikey179/vfsStream": "^1.6.5", diff --git a/php-zendframework-zend-servicemanager.spec b/php-zendframework-zend-servicemanager.spec index efb62f3..ea72992 100644 --- a/php-zendframework-zend-servicemanager.spec +++ b/php-zendframework-zend-servicemanager.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-servicemanager # -# Copyright (c) 2015-2018 Remi Collet +# Copyright (c) 2015-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 9f35a104b8d4d3b32da5f4a3b6efc0dd62e5af42 +%global gh_commit a1ed6140d0d3ee803fec96582593ed024950067b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-servicemanager @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 3.3.2 -Release: 2%{?dist} +Version: 3.4.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -34,9 +34,20 @@ BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(container-interop/container-interop) >= 1.2 with php-composer(container-interop/container-interop) < 2) +BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +# remirepo:8 +%else +BuildRequires: php-composer(container-interop/container-interop) < 2 BuildRequires: php-composer(container-interop/container-interop) >= 1.2 +BuildRequires: php-composer(psr/container) < 2 BuildRequires: php-composer(psr/container) >= 1.0 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 +%endif BuildRequires: php-reflection BuildRequires: php-date BuildRequires: php-json @@ -47,8 +58,17 @@ BuildRequires: php-spl # "phpbench/phpbench": "^0.13.0", # "phpunit/phpunit": "^5.7.25 || ^6.4.4" # "zendframework/zend-coding-standard": "~1.0.0" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(mikey179/vfsStream) >= 1.6.5 with php-composer(mikey179/vfsStream) < 2) +BuildRequires: (php-composer(ocramius/proxy-manager) >= 1.0 with php-composer(ocramius/proxy-manager) < 3) +# remirepo:6 +%else +BuildRequires: php-composer(mikey179/vfsStream) < 2 BuildRequires: php-composer(mikey179/vfsStream) >= 1.6.5 +BuildRequires: php-composer(ocramius/proxy-manager) < 4 BuildRequires: php-composer(ocramius/proxy-manager) >= 1.0 +%endif BuildRequires: phpunit6 >= 6.4.4 %endif # Autoloader @@ -60,12 +80,20 @@ BuildRequires: php-fedora-autoloader-devel # "psr/container": "^1.0", # "zendframework/zend-stdlib": "^3.1" Requires: php(language) >= 5.6 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(container-interop/container-interop) >= 1.2 with php-composer(container-interop/container-interop) < 2) +Requires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +# remirepo:8 +%else Requires: php-composer(container-interop/container-interop) >= 1.2 Requires: php-composer(container-interop/container-interop) < 2 Requires: php-composer(psr/container) >= 1.0 Requires: php-composer(psr/container) < 2 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.1 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +%endif # From phpcompatinfo report for version 3.2.0 Requires: php-reflection Requires: php-date @@ -75,7 +103,7 @@ Requires: php-spl # From composer, "suggest": { # "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services", # "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances" -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Suggests: php-composer(ocramius/proxy-manager) %endif # Autoloader @@ -147,7 +175,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmd in php php71 php72; do +for cmd in php php71 php72 php73; do if which $cmd; then $cmd %{_bindir}/phpunit6 --verbose || ret=1 fi @@ -168,6 +196,11 @@ exit $ret %changelog +* Tue Jan 8 2019 Remi Collet <remi@remirepo.net> - 3.4.0-1 +- update to 3.4.0 +- use range dependencies +- raise dependency on zend-stdlib 3.2.1 + * Wed Jan 31 2018 Remi Collet <remi@remirepo.net> - 3.3.2-1 - Update to 3.3.2 |