diff options
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-zendframework-zend-log.spec | 21 |
2 files changed, 15 insertions, 13 deletions
diff --git a/composer.json b/composer.json index af0b79b..e46f5c0 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ }, "require": { "php": "^5.6 || ^7.0", - "psr/log": "^1.0", + "psr/log": "^1.1.2", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, @@ -53,7 +53,6 @@ "ZendTest\\Log\\": "test/" }, "files": [ - "test/autoload.php", "test/Writer/TestAsset/chmod.php" ] }, @@ -62,8 +61,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.11.x-dev", - "dev-develop": "2.12.x-dev" + "dev-master": "2.12.x-dev", + "dev-develop": "2.13.x-dev" }, "zf": { "component": "Zend\\Log", diff --git a/php-zendframework-zend-log.spec b/php-zendframework-zend-log.spec index c98a8a4..dc436a9 100644 --- a/php-zendframework-zend-log.spec +++ b/php-zendframework-zend-log.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-log # -# Copyright (c) 2015-2019 Remi Collet +# Copyright (c) 2015-2020 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 cb278772afdacb1924342248a069330977625ae6 +%global gh_commit e5ec088dc8a7b4d96a3a6627761f720a738a36b8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-log @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.11.0 +Version: 2.12.0 Release: 2%{?dist} Summary: Zend Framework %{library} component @@ -43,7 +43,7 @@ BuildRequires: php-spl %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) -BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +BuildRequires: (php-composer(psr/log) >= 1.1.2 with php-composer(psr/log) < 2) # remirepo:8 %else BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 @@ -51,7 +51,7 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 BuildRequires: php-composer(psr/log) < 2 -BuildRequires: php-composer(psr/log) >= 1.0 +BuildRequires: php-composer(psr/log) >= 1.1.2 %endif # From composer, "require-dev": { # "mikey179/vfsstream": "^1.6.7", @@ -101,7 +101,7 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", -# "psr/log": "^1.0", +# "psr/log": "^1.1.2", # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", # "zendframework/zend-stdlib": "^2.7 || ^3.0" Requires: php(language) >= 5.6 @@ -110,7 +110,7 @@ Requires: php(language) >= 5.6 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) -Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +Requires: (php-composer(psr/log) >= 1.1.2 with php-composer(psr/log) < 2) # From composer, "suggest": { # "ext-mongo": "mongo extension to use Mongo writer", # "ext-mongodb": "mongodb extension to use MongoDB writer", @@ -133,7 +133,7 @@ Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 Requires: php-composer(psr/log) < 2 -Requires: php-composer(psr/log) >= 1.0 +Requires: php-composer(psr/log) >= 1.1.2 %endif %endif # Autoloader @@ -204,7 +204,6 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; ]); \Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test'); -require __DIR__ . '/../test/autoload.php'; require __DIR__ . '/../test/Writer/TestAsset/chmod.php'; EOF @@ -234,6 +233,10 @@ exit $ret %changelog +* Fri Jan 3 2020 Remi Collet <remi@remirepo.net> - 2.12.0-2 +- update to 2.12.0 +- bump dependency on psr/log 1.1.2 + * Mon Aug 26 2019 Remi Collet <remi@remirepo.net> - 2.11.0-2 - update to 2.11.0 - use range dependencies |