diff options
| author | Remi Collet <remi@remirepo.net> | 2020-09-16 14:48:18 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-09-16 14:48:18 +0200 |
| commit | 92a6cf8aa273adbfa9abcf1502bb4d0528c1ef52 (patch) | |
| tree | b7919f55cc7312fdf5cf7386ee147111a5c53a76 | |
| parent | 54556d1ea1557b0b522581001be0a9240ae5a6d7 (diff) | |
update to 3.1.3
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | php-laminas-di3.spec | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 1cab55b..4f6692e 100644 --- a/composer.json +++ b/composer.json @@ -20,10 +20,6 @@ "sort-packages": true }, "extra": { - "branch-alias": { - "dev-master": "3.1.x-dev", - "dev-develop": "3.2.x-dev" - }, "laminas": { "component": "Laminas\\Di", "config-provider": "Laminas\\Di\\ConfigProvider" @@ -71,6 +67,6 @@ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, "replace": { - "zendframework/zend-di": "self.version" + "zendframework/zend-di": "^3.1.2" } } diff --git a/php-laminas-di3.spec b/php-laminas-di3.spec index a24bd96..c5affbe 100644 --- a/php-laminas-di3.spec +++ b/php-laminas-di3.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit ee4d80f1756cf8c249e6816513f6f1f9ed89a262 +%global gh_commit 2bf302eafa283e65d7fbd083c24ad53be4bbcfce %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-di @@ -23,7 +23,7 @@ %endif Name: php-%{gh_project}%{major} -Version: 3.1.2 +Version: 3.1.3 Release: 1%{?dist} Summary: Laminas Framework %{library} component v%{major} @@ -102,8 +102,6 @@ Requires: php-pcre Requires: php-spl # Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name}%{major} < 3.1.2-99 -Provides: php-zendframework-%{zf_name}%{major} = %{version}-99 Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} @@ -176,12 +174,10 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}%{major}/autoload.p ]); EOF -: ignore test failing, only related to output order ret=0 for cmd in php php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit8 \ - --filter '^((?!(testGenerateForClassWithoutParams|testGenerateForClassWithParams)).)*$' \ --verbose || ret=1 fi done @@ -209,6 +205,9 @@ exit $ret %changelog +* Wed Sep 16 2020 Remi Collet <remi@remirepo.net> - 3.1.3-1 +- update to 3.1.3 + * Thu Jan 23 2020 Remi Collet <remi@remirepo.net> - 3.1.2-1 - update to 3.1.2 - rename to php-laminas-di3 |