diff options
| -rw-r--r-- | composer.json | 65 | ||||
| -rw-r--r-- | php-laminas-mail.spec | 76 |
2 files changed, 76 insertions, 65 deletions
diff --git a/composer.json b/composer.json index 3439c6d..e181d21 100644 --- a/composer.json +++ b/composer.json @@ -1,55 +1,49 @@ { "name": "laminas/laminas-mail", "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages", - "license": "BSD-3-Clause", "keywords": [ "laminas", "mail" ], "homepage": "https://laminas.dev", - "support": { - "docs": "https://docs.laminas.dev/laminas-mail/", - "issues": "https://github.com/laminas/laminas-mail/issues", - "source": "https://github.com/laminas/laminas-mail", - "rss": "https://github.com/laminas/laminas-mail/releases.atom", - "chat": "https://laminas.dev/chat", - "forum": "https://discourse.laminas.dev" - }, - "config": { - "sort-packages": true - }, - "extra": { - "laminas": { - "component": "Laminas\\Mail", - "config-provider": "Laminas\\Mail\\ConfigProvider" - } - }, + "license": "BSD-3-Clause", "require": { - "php": "^7.3 || ~8.0.0", + "php": "^7.3 || ~8.0.0 || ~8.1.0", "ext-iconv": "*", - "laminas/laminas-loader": "^2.5", - "laminas/laminas-mime": "^2.5", - "laminas/laminas-stdlib": "^2.7 || ^3.0", - "laminas/laminas-validator": "^2.10.2", - "laminas/laminas-zendframework-bridge": "^1.0", + "laminas/laminas-loader": "^2.8", + "laminas/laminas-mime": "^2.9.1", + "laminas/laminas-stdlib": "^3.6", + "laminas/laminas-validator": "^2.15", "symfony/polyfill-mbstring": "^1.12.0", - "true/punycode": "^2.1" + "true/punycode": "^2.1", + "webmozart/assert": "^1.10" + }, + "conflict": { + "zendframework/zend-mail": "*" }, "require-dev": { "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-config": "^3.4", - "laminas/laminas-crypt": "^2.6 || ^3.0", - "laminas/laminas-db": "^2.12", - "laminas/laminas-servicemanager": "^3.2.1", - "phpunit/phpunit": "^9.3", + "laminas/laminas-crypt": "^2.6 || ^3.4", + "laminas/laminas-db": "^2.13.3", + "laminas/laminas-servicemanager": "^3.7", + "phpunit/phpunit": "^9.5.5", "psalm/plugin-phpunit": "^0.15.1", - "symfony/process": "^5.3", + "symfony/process": "^5.3.7", "vimeo/psalm": "^4.7" }, "suggest": { "laminas/laminas-crypt": "Crammd5 support in SMTP Auth", "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages" }, + "config": { + "sort-packages": true + }, + "extra": { + "laminas": { + "component": "Laminas\\Mail", + "config-provider": "Laminas\\Mail\\ConfigProvider" + } + }, "autoload": { "psr-4": { "Laminas\\Mail\\": "src/" @@ -72,7 +66,12 @@ "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, - "replace": { - "zendframework/zend-mail": "^2.10.0" + "support": { + "issues": "https://github.com/laminas/laminas-mail/issues", + "forum": "https://discourse.laminas.dev", + "chat": "https://laminas.dev/chat", + "source": "https://github.com/laminas/laminas-mail", + "docs": "https://docs.laminas.dev/laminas-mail/", + "rss": "https://github.com/laminas/laminas-mail/releases.atom" } } diff --git a/php-laminas-mail.spec b/php-laminas-mail.spec index a850b09..8ffeccd 100644 --- a/php-laminas-mail.spec +++ b/php-laminas-mail.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit a496ab1c708b91809de211522057a6d6781bd0aa +%global gh_commit 70c3476913c74e9befd782ab665ad1b9ebac556e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-mail @@ -18,7 +18,7 @@ %global library Mail Name: php-%{gh_project} -Version: 2.14.3 +Version: 2.15.1 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -39,26 +39,25 @@ BuildRequires: php-pcre BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5 with php-autoloader(%{gh_owner}/laminas-loader) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-mime) >= 2.5 with php-autoloader(%{gh_owner}/laminas-mime) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.2 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.8 with php-autoloader(%{gh_owner}/laminas-loader) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-mime) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-mime) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15 with php-autoloader(%{gh_owner}/laminas-validator) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) BuildRequires: (php-composer(true/punycode) >= 2.1 with php-composer(true/punycode) < 3) +BuildRequires: (php-composer(webmozart/assert) >= 1.10 with php-composer(webmozart/assert) < 2) # From composer, "require-dev": { # "laminas/laminas-coding-standard": "~1.0.0", -# "laminas/laminas-config": "^3.4", -# "laminas/laminas-crypt": "^2.6 || ^3.0", -# "laminas/laminas-db": "^2.12", -# "laminas/laminas-servicemanager": "^3.2.1", -# "phpunit/phpunit": "^9.3" +# "laminas/laminas-crypt": "^2.6 || ^3.4", +# "laminas/laminas-db": "^2.13.3", +# "laminas/laminas-servicemanager": "^3.7", +# "phpunit/phpunit": "^9.5.5" # "psalm/plugin-phpunit": "^0.15.1", -# "symfony/process": "^5.3", +# "symfony/process": "^5.3.7", # "vimeo/psalm": "^4.7" -BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 3.4 with php-autoloader(%{gh_owner}/laminas-config) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-crypt) >= 3.0 with php-autoloader(%{gh_owner}/laminas-crypt) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.12 with php-autoloader(%{gh_owner}/laminas-db) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-crypt) >= 3.4 with php-autoloader(%{gh_owner}/laminas-crypt) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.13.3 with php-autoloader(%{gh_owner}/laminas-db) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.7 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) # ignore min version BuildRequires: (php-composer(symfony/process) >= 4 with php-composer(symfony/process) < 6) # remirepo:13 @@ -69,39 +68,40 @@ BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-validator BuildRequires: php-laminas-zendframework-bridge BuildRequires: php-true-punycode -BuildRequires: php-laminas-config3 +BuildRequires: php-webmozart-assert BuildRequires: php-laminas-crypt BuildRequires: php-laminas-db BuildRequires: php-laminas-servicemanager BuildRequires: php-symfony4-process %endif -BuildRequires: phpunit9 >= 9.3 +BuildRequires: phpunit9 >= 9.5.5 %global phpunit %{_bindir}/phpunit9 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0", +# "php": "^7.3 || ~8.0.0 || ~8.1.0", # "ext-iconv": "*", -# "laminas/laminas-loader": "^2.5", -# "laminas/laminas-mime": "^2.5", -# "laminas/laminas-stdlib": "^2.7 || ^3.0", -# "laminas/laminas-validator": "^2.10.2", -# "laminas/laminas-zendframework-bridge": "^1.0", +# "laminas/laminas-loader": "^2.8", +# "laminas/laminas-mime": "^2.9.1", +# "laminas/laminas-stdlib": "^3.6", +# "laminas/laminas-validator": "^2.15", # "symfony/polyfill-mbstring": "^1.12.0", -# "true/punycode": "^2.1" +# "true/punycode": "^2.1", +# "webmozart/assert": "^1.10" Requires: php(language) >= 7.3 Requires: php-iconv Requires: php-mbstring # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5 with php-autoloader(%{gh_owner}/laminas-loader) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-mime) >= 2.5 with php-autoloader(%{gh_owner}/laminas-mime) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.2 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.8 with php-autoloader(%{gh_owner}/laminas-loader) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-mime) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-mime) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15 with php-autoloader(%{gh_owner}/laminas-validator) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) Requires: (php-composer(true/punycode) >= 2.1 with php-composer(true/punycode) < 3) +Requires: (php-composer(webmozart/assert) >= 1.10 with php-composer(webmozart/assert) < 2) # From composer, "suggest": { # "laminas/laminas-crypt": "Crammd5 support in SMTP Auth", # "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages" @@ -109,7 +109,7 @@ Suggests: php-autoloader(%{gh_owner}/laminas-crypt) Suggests: php-autoloader(%{gh_owner}/laminas-servicemanager) # From phpcompatinfo report Recommends: php-imap -# remirepo:8 +# remirepo:9 %else Requires: php-laminas-loader Requires: php-laminas-mime @@ -117,6 +117,7 @@ Requires: php-laminas-stdlib Requires: php-laminas-validator Requires: php-laminas-zendframework-bridge Requires: php-true-punycode +Requires: php-webmozart-assert %endif # Autoloader Requires: php-composer(fedora/autoloader) @@ -164,6 +165,7 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/%{namespace}/Stdlib/autoload.php', '%{php_home}/%{namespace}/Validator/autoload.php', '%{php_home}/TrueBV/autoload.php', + '%{php_home}/Webmozart/Assert/autoload.php', ]); \Fedora\Autoloader\Dependencies::optional([ '%{php_home}/%{namespace}/ServiceManager/autoload.php', @@ -198,7 +200,7 @@ cat << 'EOF' | tee vendor/autoload.php <?php require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/%{namespace}/Config3/autoload.php', + '%{php_home}/%{namespace}/Crypt/autoload.php', '%{php_home}/%{namespace}/Db/autoload.php', [ '%{php_home}/Symfony5/Component/Process/autoload.php', @@ -217,7 +219,7 @@ exit (class_exists("\\Zend\\%{library}\\Message") ? 0 : 1); : upstream test suite # testCanUseTraversableAsSpec use Composer\\InstalledVersions ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -242,6 +244,16 @@ exit $ret %changelog +* Fri Sep 24 2021 Remi Collet <remi@remirepo.net> - 2.15.1-1 +- update to 2.15.1 +- keep compatibility using laminas-zendframework-bridge + as this is only used using compat autolader +- raise dependency on laminas-loader 2.8 +- raise dependency on laminas-mime 2.9.1 +- raise dependency on laminas-stdlib 3.6 +- raise dependency on laminas-validator 2.15 +- add dependency on webmozart/assert + * Thu Sep 23 2021 Remi Collet <remi@remirepo.net> - 2.14.3-1 - update to 2.14.3 |