diff options
| -rw-r--r-- | php-laminas-servicemanager-di.spec | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/php-laminas-servicemanager-di.spec b/php-laminas-servicemanager-di.spec index 91f1622..19ce625 100644 --- a/php-laminas-servicemanager-di.spec +++ b/php-laminas-servicemanager-di.spec @@ -1,6 +1,6 @@ # remirepo/Fedora spec file for php-laminas-servicemanager-di # -# Copyright (c) 2016-2020 Remi Collet +# Copyright (c) 2016-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -24,7 +24,7 @@ Name: php-%{gh_project} Version: 1.2.1 -Release: 2%{?dist} +Release: 8%{?dist} Summary: %{namespace} Framework %{library}-%{subproj} component License: BSD @@ -42,13 +42,11 @@ BuildRequires: php-spl # "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4" # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) BuildRequires: (php-autoloader(%{gh_owner}/laminas-di) >= 2.6 with php-autoloader(%{gh_owner}/laminas-di) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.12 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) -# remirepo:10 +# remirepo:5 %else -BuildRequires: php-container-interop >= 1.1 BuildRequires: php-laminas-di BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-zendframework-bridge @@ -68,13 +66,11 @@ BuildRequires: php-fedora-autoloader-devel Requires: php(language) >= 5.6 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) Requires: (php-autoloader(%{gh_owner}/laminas-di) >= 2.6 with php-autoloader(%{gh_owner}/laminas-di) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.12 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) -# remirepo:6 +# remirepo:5 %else -Requires: php-container-interop >= 1.1 Requires: php-laminas-di Requires: php-laminas-servicemanager Requires: php-laminas-zendframework-bridge @@ -109,9 +105,8 @@ mv LICENSE.md LICENSE phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/Interop/Container/autoload.php', - '%{php_home}/%{namespace}/Di/autoload.php', '%{php_home}/%{namespace}/ServiceManager/autoload.php', + '%{php_home}/%{namespace}/Di/autoload.php', ]); EOF @@ -152,7 +147,7 @@ exit (class_exists("\\Zend\\%{library}\\%{subproj}\\DiFactory") ? 0 : 1); : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php72 php73 php74; do +for cmdarg in "php %{phpunit}" php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 @@ -165,6 +160,7 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -174,6 +170,10 @@ exit $ret %changelog +* Thu Jun 23 2022 Remi Collet <remi@remirepo.net> - 1.2.1-8 +- drop dependency on container-interop/container-interop + replaced by servicemanager >= 3.12 + * Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 1.2.1-2 - cleanup |