diff options
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | php-laminas-config3.spec | 13 |
2 files changed, 9 insertions, 12 deletions
diff --git a/composer.json b/composer.json index cad9aad..eddd3ed 100644 --- a/composer.json +++ b/composer.json @@ -18,14 +18,8 @@ "config": { "sort-packages": true }, - "extra": { - "branch-alias": { - "dev-master": "3.4.x-dev", - "dev-develop": "3.5.x-dev" - } - }, "require": { - "php": "^7.3 || ^8.0", + "php": "^7.3 || ~8.0.0", "ext-json": "*", "laminas/laminas-stdlib": "^2.7.7 || ^3.1", "laminas/laminas-zendframework-bridge": "^1.0", diff --git a/php-laminas-config3.spec b/php-laminas-config3.spec index cbf9814..83bbdae 100644 --- a/php-laminas-config3.spec +++ b/php-laminas-config3.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-laminas-config3 # -# Copyright (c) 2015-2020 Remi Collet +# Copyright (c) 2015-2021 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 0bce6f5abab41dc673196741883b19018a2b5994 +%global gh_commit f91cd6fe79e82cbbcaa36485108a04e8ef1e679b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-config @@ -23,7 +23,7 @@ %endif Name: php-%{gh_project}%{major} -Version: 3.4.0 +Version: 3.5.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component v%{major} @@ -71,7 +71,7 @@ BuildRequires: phpunit8 >= 8.5.8 BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ^8.0", +# "php": "^7.3 || ~8.0.0", # "ext-json": "*", # "laminas/laminas-stdlib": "^2.7.7 || ^3.1", # "laminas/laminas-zendframework-bridge": "^1.0", @@ -180,7 +180,7 @@ exit (class_exists("\\Zend\\%{library}\\Config") ? 0 : 1); : upstream test suite ret=0 -for cmd in php php72 php73 php74 php80; do +for cmd in php php73 php74 php80; do if which $cmd; then $cmd %{_bindir}/phpunit8 || ret=1 fi @@ -202,6 +202,9 @@ exit $ret %changelog +* Mon Feb 15 2021 Remi Collet <remi@remirepo.net> - 3.5.0-1 +- update to 3.5.0 + * Tue Aug 25 2020 Remi Collet <remi@remirepo.net> - 3.4.0-1 - update to 3.4.0 - raise dependency on PHP 7.3 |