Update to 2.9.0

raise dependency on PHP 7.1
raise dependency on zend-validator 2.10.2
always use phpunit6
use range dependencies on F27+

2 files changed, 60 insertions, 31 deletions

diff --git a/composer.json b/composer.json
index dbfca53..d9bb97f 100644
--- a/composer.json
+++ b/composer.json
@@ -13,12 +13,12 @@
         }
     },
     "require": {
-        "php": "^7.0 || ^5.6",
+        "php": "^7.1",
         "ext-iconv": "*",
         "zendframework/zend-loader": "^2.5",
         "zendframework/zend-mime": "^2.5",
         "zendframework/zend-stdlib": "^2.7 || ^3.0",
-        "zendframework/zend-validator": "^2.6"
+        "zendframework/zend-validator": "^2.10.2"
     },
     "require-dev": {
         "zendframework/zend-config": "^2.6",
@@ -57,7 +57,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }
diff --git a/php-zendframework-zend-mail.spec b/php-zendframework-zend-mail.spec
index c3d3068..56221ff 100644
--- a/php-zendframework-zend-mail.spec
+++ b/php-zendframework-zend-mail.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    248230940ab1453b2a532a8fde76c5a6470d7aad
+%global gh_commit    067248425f285dec0bdb74256a8f67f9092f115e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-mail
@@ -20,68 +20,94 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.8.0
-Release:        4%{?dist}
+Version:        2.9.0
+Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
-Group:          Development/Libraries
 License:        BSD
 URL:            https://zendframework.github.io/%{gh_project}/
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/zendframework/zend-mail/pull/174.patch
-
 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
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
-BuildRequires:  php-autoloader(%{gh_owner}/zend-loader)         >= 2.5
-BuildRequires:  php-autoloader(%{gh_owner}/zend-mime)           >= 2.5
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
-BuildRequires:  php-autoloader(%{gh_owner}/zend-validator)      >= 2.6
+# remirepo:1
+%if 0%{fedora} >= 27
+BuildRequires:  (php-autoloader(%{gh_owner}/zend-loader)         >= 2.5    with php-autoloader(%{gh_owner}/zend-loader)         < 3)
+BuildRequires:  (php-autoloader(%{gh_owner}/zend-mime)           >= 2.5    with php-autoloader(%{gh_owner}/zend-mime)           < 3)
+BuildRequires:  (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7    with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+BuildRequires:  (php-autoloader(%{gh_owner}/zend-validator)      >= 2.10.2 with php-autoloader(%{gh_owner}/zend-validator)      < 3)
+# remirepo:10
+%else
+BuildRequires:  php-autoloader(%{gh_owner}/zend-loader)          <  3
+BuildRequires:  php-autoloader(%{gh_owner}/zend-loader)          >= 2.5
+BuildRequires:  php-autoloader(%{gh_owner}/zend-mime)            <  3
+BuildRequires:  php-autoloader(%{gh_owner}/zend-mime)            >= 2.5
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)          <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)          >= 2.7
+BuildRequires:  php-autoloader(%{gh_owner}/zend-validator)       <  3
+BuildRequires:  php-autoloader(%{gh_owner}/zend-validator)       >= 2.10.2
+%endif
 # From composer, "require-dev": {
 #        "zendframework/zend-config": "^2.6",
 #        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+# ignore and allow v3
 #        "zendframework/zend-crypt": "^2.6",
 #        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
 #        "zendframework/zend-coding-standard": "~1.0.0"
-BuildRequires:  php-autoloader(%{gh_owner}/zend-config)         >= 2.6
-BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
-BuildRequires:  php-autoloader(%{gh_owner}/zend-crypt)          >= 2.6
-%if 0%{?fedora} >= 26
-%global phpunit %{_bindir}/phpunit6
+# remirepo:1
+%if 0%{fedora} >= 27
+BuildRequires:  (php-autoloader(%{gh_owner}/zend-config)         >= 2.6    with php-autoloader(%{gh_owner}/zend-config)         < 3)
+BuildRequires:  (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5  with php-autoloader(%{gh_owner}/zend-servicemanager) < 4)
+BuildRequires:  (php-autoloader(%{gh_owner}/zend-crypt)          >= 2.6    with php-autoloader(%{gh_owner}/zend-crypt)          < 4)
+# remirepo:8
 %else
-%global phpunit %{_bindir}/phpunit
+BuildRequires:  php-autoloader(%{gh_owner}/zend-config)          <  3
+BuildRequires:  php-autoloader(%{gh_owner}/zend-config)          >= 2.6
+BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager)  <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-servicemanager)  >= 2.7.5
+BuildRequires:  php-autoloader(%{gh_owner}/zend-crypt)           <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-crypt)           >= 2.6
 %endif
-BuildRequires:  %{phpunit}
+BuildRequires:  phpunit6
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^7.0 || ^5.6",
+#        "php": "^7.1",
 #        "ext-iconv": "*",
 #        "zendframework/zend-loader": "^2.5",
 #        "zendframework/zend-mime": "^2.5",
 #        "zendframework/zend-stdlib": "^2.7 || ^3.0",
-#        "zendframework/zend-validator": "^2.6"
-Requires:       php(language) >= 5.6
+#        "zendframework/zend-validator": "^2.10.2"
+Requires:       php(language) >= 7.1
 Requires:       php-iconv
 %if ! %{bootstrap}
+# remirepo:1
+%if 0%{fedora} >= 27
+Requires:       (php-autoloader(%{gh_owner}/zend-loader)        >= 2.5    with php-autoloader(%{gh_owner}/zend-loader)         < 3)
+Requires:       (php-autoloader(%{gh_owner}/zend-mime)          >= 2.5    with php-autoloader(%{gh_owner}/zend-mime)           < 3)
+Requires:       (php-autoloader(%{gh_owner}/zend-stdlib)        >= 2.7    with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+Requires:       (php-autoloader(%{gh_owner}/zend-validator)     >= 2.10.2 with php-autoloader(%{gh_owner}/zend-validator)      < 3)
+# remirepo:10
+%else
 Requires:       php-autoloader(%{gh_owner}/zend-loader)         >= 2.5
 Requires:       php-autoloader(%{gh_owner}/zend-loader)         <  3
 Requires:       php-autoloader(%{gh_owner}/zend-mime)           >= 2.5
 Requires:       php-autoloader(%{gh_owner}/zend-mime)           <  3
 Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
 Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
-Requires:       php-autoloader(%{gh_owner}/zend-validator)      >= 2.6
+Requires:       php-autoloader(%{gh_owner}/zend-validator)      >= 2.10.2
 Requires:       php-autoloader(%{gh_owner}/zend-validator)      <  3
+%endif
 # From composer, "suggest": {
 #        "ext-intl": "Handle IDN in AddressList hostnames",
 #        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3 when using SMTP to deliver messages"
@@ -118,7 +144,6 @@ Documentation: https://zendframework.github.io/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
 
 mv LICENSE.md LICENSE
 
@@ -158,11 +183,9 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
+for cmd in php php71 php72; do
   if which $cmd; then
-    set $cmd
-    $1 ${2:-%{_bindir}/phpunit6} \
-      --filter '^((?!(testCanBeEncoded)).)*$' \
+    $cmd %{_bindir}/phpunit6 \
       --verbose || ret=1
   fi
 done
@@ -181,6 +204,13 @@ exit $ret
 
 
 %changelog
+* Fri Mar  2 2018 Remi Collet <remi@remirepo.net> - 2.9.0-1
+- Update to 2.9.0
+- raise dependency on PHP 7.1
+- raise dependency on zend-validator 2.10.2
+- always use phpunit6
+- use range dependencies on F27+
+
 * Tue Dec 12 2017 Remi Collet <remi@remirepo.net> - 2.8.0-4
 - switch from zend-loader to fedora/autoloader
 - fix FTBFS from Koschei, ignore 1 test, reported as