diff options
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-laminas-escaper.spec | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/composer.json b/composer.json index f6ea6e1..92515dc 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,7 @@ "extra": { }, "require": { - "php": "^7.3 || ~8.0.0", - "laminas/laminas-zendframework-bridge": "^1.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, "suggest": { "ext-iconv": "*", @@ -55,7 +54,7 @@ "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, - "replace": { - "zendframework/zend-escaper": "^2.6.1" + "conflict": { + "zendframework/zend-escaper": "*" } } diff --git a/php-laminas-escaper.spec b/php-laminas-escaper.spec index 5d2d957..9d885a5 100644 --- a/php-laminas-escaper.spec +++ b/php-laminas-escaper.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 2d6dce99668b413610e9544183fa10392437f542 +%global gh_commit 891ad70986729e20ed2e86355fcf93c9dc238a5f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-escaper @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 2.8.0 +Version: 2.9.0 Release: 1%{?dist} Summary: Laminas Framework %{library} component @@ -59,8 +59,7 @@ BuildRequires: php-fedora-autoloader-devel %endif # From composer, "require": { -# "php": "^7.3 || ~8.0.0", -# "laminas/laminas-zendframework-bridge": "^1.0" +# "php": "^7.3 || ~8.0.0 || ~8.1.0", Requires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -171,6 +170,11 @@ exit $ret %changelog +* Fri Sep 3 2021 Remi Collet <remi@remirepo.net> - 2.9.0-1 +- update to 2.9.0 (no change) +- keep compatibility using laminas-zendframework-bridge + as this is only used using compat autolader + * Mon Jun 28 2021 Remi Collet <remi@remirepo.net> - 2.8.0-1 - update to 2.8.0 |