diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-laminas-filter.spec | 21 |
2 files changed, 14 insertions, 9 deletions
diff --git a/composer.json b/composer.json index 377fab9..1d76bc9 100644 --- a/composer.json +++ b/composer.json @@ -33,12 +33,12 @@ }, "require": { "php": "^7.4 || ~8.0.0 || ~8.1.0", + "laminas/laminas-servicemanager": "^3.14.0", "laminas/laminas-stdlib": "^3.6.1" }, "require-dev": { "laminas/laminas-coding-standard": "^2.3.0", "laminas/laminas-crypt": "^3.5.1", - "laminas/laminas-servicemanager": "^3.14.0", "laminas/laminas-uri": "^2.9.1", "pear/archive_tar": "^1.4.14", "phpspec/prophecy-phpunit": "^2.0.1", diff --git a/php-laminas-filter.spec b/php-laminas-filter.spec index 51b51dc..17f456f 100644 --- a/php-laminas-filter.spec +++ b/php-laminas-filter.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit a9295b93df24bcd90e9b87f470e5a0a0250d07ee +%global gh_commit f5a3736cb49f06a3ba8941803bf84559bed4c3fa %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-filter @@ -18,7 +18,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 2.15.1 +Version: 2.16.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -40,12 +40,12 @@ BuildRequires: php-spl BuildRequires: php-zip # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.14 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { # "laminas/laminas-coding-standard": "~2.3.0", # "laminas/laminas-crypt": "^3.5.1", -# "laminas/laminas-servicemanager": "^3.14.0", # "laminas/laminas-uri": "^2.9", # "pear/archive_tar": "^1.4.14", # "phpspec/prophecy-phpunit": "^2.0.1", @@ -54,16 +54,15 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "psr/http-factory": "^1.0.1", # "vimeo/psalm": "^4.13.1" BuildRequires: (php-autoloader(%{gh_owner}/laminas-crypt) >= 3.5.1 with php-autoloader(%{gh_owner}/laminas-crypt) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.14 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-uri) < 3) BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0.1 with php-composer(phpspec/prophecy-phpunit) < 3) BuildRequires: (php-composer(psr/http-factory) >= 1.0.1 with php-composer(psr/http-factory) < 2) # remirepo:9 %else +BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-zendframework-bridge BuildRequires: php-laminas-crypt -BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-uri BuildRequires: php-phpspec-prophecy-phpunit BuildRequires: php-psr-http-factory @@ -77,11 +76,13 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^7.4 || ~8.0.0 || ~8.1.0", +# "laminas/laminas-servicemanager": "^3.14.0", # "laminas/laminas-stdlib": "^3.6.1" Requires: php(language) >= 7.4 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.14 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) # From composer, "suggest": { # "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters", @@ -91,7 +92,6 @@ Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 # "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters" Suggests: php-autoloader(%{gh_owner}/laminas-crypt) Suggests: php-autoloader(%{gh_owner}/laminas-i18n) -Suggests: php-autoloader(%{gh_owner}/laminas-servicemanager) Suggests: php-autoloader(%{gh_owner}/laminas-uri) Suggests: php-composer(psr/http-factory-implementation) # optional compression extensions @@ -102,8 +102,9 @@ Suggests: php-lzf Suggests: php-snappy Suggests: php-rar Recommends: php-zip -# remirepo:4 +# remirepo:5 %else +Requires: php-laminas-servicemanager Requires: php-laminas-stdlib Requires: php-laminas-zendframework-bridge %endif @@ -147,13 +148,13 @@ 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}/%{namespace}/ServiceManager/autoload.php', '%{php_home}/%{namespace}/Stdlib/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ '%{php_home}/Psr/Http/Message/http-factory-autoload.php', '%{php_home}/%{namespace}/Crypt/autoload.php', '%{php_home}/%{namespace}/I18n/autoload.php', - '%{php_home}/%{namespace}/ServiceManager/autoload.php', '%{php_home}/%{namespace}/Uri/autoload.php', '%{_datadir}/pear/Archive/Tar.php', ]); @@ -230,6 +231,10 @@ exit $ret %changelog +* Wed Jul 13 2022 Remi Collet <remi@remirepo.net> - 2.16.0-1 +- update to 2.16.0 +- add dependency on laminas-servicemanager + * Tue Jul 12 2022 Remi Collet <remi@remirepo.net> - 2.15.1-1 - update to 2.15.1 |