diff options
| -rw-r--r-- | composer.json | 10 | ||||
| -rw-r--r-- | php-laminas-mail.spec | 22 |
2 files changed, 16 insertions, 16 deletions
diff --git a/composer.json b/composer.json index b119f09..d43eba1 100644 --- a/composer.json +++ b/composer.json @@ -19,17 +19,13 @@ "sort-packages": true }, "extra": { - "branch-alias": { - "dev-master": "2.11.x-dev", - "dev-develop": "2.12.x-dev" - }, "laminas": { "component": "Laminas\\Mail", "config-provider": "Laminas\\Mail\\ConfigProvider" } }, "require": { - "php": "^5.6 || ^7.0", + "php": "^7.1", "ext-iconv": "*", "laminas/laminas-loader": "^2.5", "laminas/laminas-mime": "^2.5", @@ -42,8 +38,8 @@ "laminas/laminas-coding-standard": "~1.0.0", "laminas/laminas-config": "^2.6", "laminas/laminas-crypt": "^2.6 || ^3.0", - "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1", - "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4" + "laminas/laminas-servicemanager": "^3.2.1", + "phpunit/phpunit": "^7.5.20" }, "suggest": { "laminas/laminas-crypt": "Crammd5 support in SMTP Auth", diff --git a/php-laminas-mail.spec b/php-laminas-mail.spec index 9512df9..edc7038 100644 --- a/php-laminas-mail.spec +++ b/php-laminas-mail.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 4c5545637eea3dc745668ddff1028692ed004c4b +%global gh_commit a85bd6ec20ebc382498cc1d3086dfe3fa201849b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-mail @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 2.11.0 +Version: 2.12.2 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -34,7 +34,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 7.1 BuildRequires: php-ctype BuildRequires: php-date BuildRequires: php-iconv @@ -52,11 +52,11 @@ BuildRequires: (php-composer(true/punycode) >= 2.1 # "laminas/laminas-coding-standard": "~1.0.0", # "laminas/laminas-config": "^2.6", # "laminas/laminas-crypt": "^2.6 || ^3.0", -# "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1", -# "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4" +# "laminas/laminas-servicemanager": "^3.2.1", +# "phpunit/phpunit": "^7.5.20" BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 2.6 with php-autoloader(%{gh_owner}/laminas-config) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-crypt) >= 3.0 with php-autoloader(%{gh_owner}/laminas-crypt) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.3.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) # remirepo:11 %else BuildRequires: php-laminas-loader @@ -69,14 +69,14 @@ BuildRequires: php-laminas-config BuildRequires: php-laminas-crypt BuildRequires: php-laminas-servicemanager %endif -BuildRequires: phpunit7 >= 7.1.4 +BuildRequires: phpunit7 >= 7.5.20 %global phpunit %{_bindir}/phpunit7 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.6 || ^7.0", +# "php": "^7.1", # "ext-iconv": "*", # "laminas/laminas-loader": "^2.5", # "laminas/laminas-mime": "^2.5", @@ -84,7 +84,7 @@ BuildRequires: php-fedora-autoloader-devel # "laminas/laminas-validator": "^2.10.2", # "laminas/laminas-zendframework-bridge": "^1.0", # "true/punycode": "^2.1" -Requires: php(language) >= 5.6 +Requires: php(language) >= 7.1 Requires: php-iconv # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -227,6 +227,10 @@ exit $ret %changelog +* Tue Aug 11 2020 Remi Collet <remi@remirepo.net> - 2.12.2-1 +- update to 2.12.2 +- raise dependency on PHP 7.1 + * Wed Jul 1 2020 Remi Collet <remi@remirepo.net> - 2.11.0-1 - update to 2.11.0 |