diff options
| -rw-r--r-- | 244.patch | 41 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-laminas-mail.spec | 16 |
3 files changed, 9 insertions, 50 deletions
diff --git a/244.patch b/244.patch deleted file mode 100644 index f2d42a5..0000000 --- a/244.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3b4761424fdb494262f7f4c215c9dbd19cca53e0 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 9 Oct 2019 13:49:30 +0200 -Subject: [PATCH] fix read of 8192 bytes failed with errno=21 Is a directory - ---- - src/Storage/Mbox.php | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Storage/Mbox.php b/src/Storage/Mbox.php -index 30de89cd..8ae352ac 100644 ---- a/src/Storage/Mbox.php -+++ b/src/Storage/Mbox.php -@@ -216,8 +216,8 @@ public function __construct($params) - */ - protected function isMboxFile($file, $fileIsString = true) - { -+ ErrorHandler::start(E_NOTICE); - if ($fileIsString) { -- ErrorHandler::start(E_WARNING); - $file = fopen($file, 'r'); - ErrorHandler::stop(); - if (! $file) { -@@ -230,15 +230,15 @@ protected function isMboxFile($file, $fileIsString = true) - $result = false; - - $line = fgets($file) ?: ''; -+ - if (strpos($line, 'From ') === 0) { - $result = true; - } - - if ($fileIsString) { -- ErrorHandler::start(E_WARNING); - fclose($file); -- ErrorHandler::stop(); - } -+ ErrorHandler::stop(); - - return $result; - } diff --git a/composer.json b/composer.json index df6c46b..be14072 100644 --- a/composer.json +++ b/composer.json @@ -70,6 +70,6 @@ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, "replace": { - "zendframework/zend-mail": "self.version" + "zendframework/zend-mail": "^2.10.0" } } diff --git a/php-laminas-mail.spec b/php-laminas-mail.spec index 80fe19f..0b22099 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 019fb670c1dff6be7fc91d3b88942bd0a5f68792 +%global gh_commit cfe0711446c8d9c392e9fc664c9ccc180fa89005 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-mail @@ -22,8 +22,8 @@ %endif Name: php-%{gh_project} -Version: 2.10.0 -Release: 2%{?dist} +Version: 2.10.1 +Release: 1%{?dist} Summary: %{namespace} Framework %{library} component License: BSD @@ -31,8 +31,6 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -Patch0: https://patch-diff.githubusercontent.com/raw/zendframework/zend-mail/pull/244.patch - BuildArch: noarch # Tests %if %{with_tests} @@ -124,8 +122,8 @@ Requires: php-spl Obsoletes: php-ZendFramework2-%{library} < 2.5 Provides: php-ZendFramework2-%{library} = %{version} # Compatibily ensure by the bridge -Obsoletes: php-zendframework-%{zf_name} < 2.10.0-99 -Provides: php-zendframework-%{zf_name} = %{version}-99 +Obsoletes: php-zendframework-%{zf_name} < 2.10.1 +Provides: php-zendframework-%{zf_name} = %{version} Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} @@ -144,7 +142,6 @@ Documentation: https://docs.laminas.dev/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 mv LICENSE.md LICENSE @@ -230,6 +227,9 @@ exit $ret %changelog +* Wed Apr 22 2020 Remi Collet <remi@remirepo.net> - 2.10.1-1 +- update to 2.10.1 + * Fri Jan 17 2020 Remi Collet <remi@remirepo.net> - 2.10.0-2 - cleanup |