Update to 6.0.1

rename to php-phpunit-php-code-coverage6
move to /usr/share/php/SebastianBergmann/CodeCoverage6
raise dependency on PHP 7.1
raise dependency on phpunit/php-token-stream 3.0
use range dependencies on F27+
use phpunit7
bootstrap build

2 files changed, 66 insertions, 50 deletions

diff --git a/composer.json b/composer.json
index ed87651..4e44d0a 100644
--- a/composer.json
+++ b/composer.json
@@ -25,11 +25,11 @@
     },
     "prefer-stable": true,
     "require": {
-        "php": "^7.0",
+        "php": "^7.1",
         "ext-dom": "*",
         "ext-xmlwriter": "*",
         "phpunit/php-file-iterator": "^1.4.2",
-        "phpunit/php-token-stream": "^2.0.1",
+        "phpunit/php-token-stream": "^3.0",
         "phpunit/php-text-template": "^1.2.1",
         "sebastian/code-unit-reverse-lookup": "^1.0.1",
         "sebastian/environment": "^3.0",
@@ -37,10 +37,10 @@
         "theseer/tokenizer": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0"
+        "phpunit/phpunit": "^7.0"
     },
     "suggest": {
-        "ext-xdebug": "^2.5.5"
+        "ext-xdebug": "^2.6.0"
     },
     "autoload": {
         "classmap": [
@@ -49,7 +49,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.3.x-dev"
+            "dev-master": "6.0-dev"
         }
     }
 }
diff --git a/php-phpunit-php-code-coverage6.spec b/php-phpunit-php-code-coverage6.spec
index 6b01829..50df34f 100644
--- a/php-phpunit-php-code-coverage6.spec
+++ b/php-phpunit-php-code-coverage6.spec
@@ -1,15 +1,15 @@
-# remirepo/fedora spec file for php-phpunit-php-code-coverage5
+# remirepo/fedora spec file for php-phpunit-php-code-coverage6
 #
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 
-%global bootstrap    0
+%global bootstrap    1
 # Github
-%global gh_commit    661f34d0bd3f1a7225ef491a70a020ad23a057a1
+%global gh_commit    f8ca4b604baf23dab89d87773c28cc07405189ba
 #global gh_date      20150924
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    sebastianbergmann
@@ -21,10 +21,10 @@
 %global ns_vendor    SebastianBergmann
 %global ns_project   CodeCoverage
 %global php_home     %{_datadir}/php
-%global ver_major    5
-%global ver_minor    3
-%global ver_patch    0
-%global specrel      1
+%global ver_major    6
+%global ver_minor    0
+%global ver_patch    1
+%global specrel      0
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
 %else
@@ -51,55 +51,61 @@ Patch0:         %{name}-fonts.patch
 BuildArch:      noarch
 BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 %if %{with_tests}
-BuildRequires:  php(language) >= 7.0
-BuildRequires:  php-composer(phpunit/php-file-iterator) <  2
-BuildRequires:  php-composer(phpunit/php-file-iterator) >= 1.4.2
-BuildRequires:  php-composer(phpunit/php-token-stream) <  3
-BuildRequires:  php-composer(phpunit/php-token-stream) >= 2.0.1
-BuildRequires:  php-composer(phpunit/php-text-template) <  2
-BuildRequires:  php-composer(phpunit/php-text-template) >= 1.2.1
-BuildRequires:  php-composer(sebastian/code-unit-reverse-lookup) <  2
-BuildRequires:  php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1
-BuildRequires:  php-composer(sebastian/environment) <  4
-BuildRequires:  php-composer(sebastian/environment) >= 3.0
-BuildRequires:  php-composer(sebastian/version) <  3
-BuildRequires:  php-composer(sebastian/version) >= 2.0.1
-BuildRequires:  php-composer(theseer/tokenizer) <  2
-BuildRequires:  php-composer(theseer/tokenizer) >= 1.1
+BuildRequires:  php(language) >= 7.1
+%if 0%{?fedora} >= 27
+BuildRequires:  (php-composer(phpunit/php-file-iterator) >= 1.4.2          with php-composer(phpunit/php-file-iterator) <  2)
+BuildRequires:  (php-composer(phpunit/php-token-stream) >= 3.0             with php-composer(phpunit/php-token-stream) <  4)
+BuildRequires:  (php-composer(phpunit/php-text-template) >= 1.2.1          with php-composer(phpunit/php-text-template) <  2)
+BuildRequires:  (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) <  2)
+BuildRequires:  (php-composer(sebastian/environment) >= 3.0                with php-composer(sebastian/environment) <  4)
+BuildRequires:  (php-composer(sebastian/version) >= 2.0.1                  with php-composer(sebastian/version) <  3)
+BuildRequires:  (php-composer(theseer/tokenizer) >= 1.1                    with php-composer(theseer/tokenizer) <  2)
+%else
+BuildRequires:  php-phpunit-File-Iterator              >= 1.4.2
+BuildRequires:  php-phpunit-php-token-stream3
+BuildRequires:  php-phpunit-Text-Template              >= 1.2.1
+BuildRequires:  php-sebastian-code-unit-reverse-lookup >= 1.0.1
+BuildRequires:  php-sebastian-environment3
+BuildRequires:  php-phpunit-Version                    >= 2.0.1
+BuildRequires:  php-theseer-tokenizer                  >= 1.1
+%endif
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.0"
-BuildRequires:  phpunit6
-BuildRequires:  php-pecl-xdebug  >= 2.5.5
+#        "phpunit/phpunit": "^7.0"
+BuildRequires:  phpunit7
+BuildRequires:  php-pecl-xdebug  >= 2.6.0
 %endif
 
 # From composer.json, require
-#        "php": "^7.0",
+#        "php": "^7.1",
 #        "ext-dom": "*",
 #        "ext-xmlwriter": "*",
 #        "phpunit/php-file-iterator": "^1.4.2",
-#        "phpunit/php-token-stream": "^2.0.1",
+#        "phpunit/php-token-stream": "^3.0",
 #        "phpunit/php-text-template": "^1.2.1",
 #        "sebastian/code-unit-reverse-lookup": "^1.0.1",
 #        "sebastian/environment": "^3.0",
 #        "sebastian/version": "^2.0.1",
 #        "theseer/tokenizer": "^1.1"
-Requires:       php(language) >= 7.0
+Requires:       php(language) >= 7.1
 Requires:       php-dom
 Requires:       php-xmlwriter
-Requires:       php-composer(phpunit/php-file-iterator) <  2
-Requires:       php-composer(phpunit/php-file-iterator) >= 1.4.2
-Requires:       php-composer(phpunit/php-token-stream) <  3
-Requires:       php-composer(phpunit/php-token-stream) >= 2.0.1
-Requires:       php-composer(phpunit/php-text-template) <  2
-Requires:       php-composer(phpunit/php-text-template) >= 1.2.1
-Requires:       php-composer(sebastian/code-unit-reverse-lookup) <  2
-Requires:       php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1
-Requires:       php-composer(sebastian/environment) <  4
-Requires:       php-composer(sebastian/environment) >= 3.0
-Requires:       php-composer(sebastian/version) <  3
-Requires:       php-composer(sebastian/version) >= 2.0.1
-Requires:       php-composer(theseer/tokenizer) <  2
-Requires:       php-composer(theseer/tokenizer) >= 1.1
+%if 0%{?fedora} >= 27
+Requires:       (php-composer(phpunit/php-file-iterator) >= 1.4.2          with php-composer(phpunit/php-file-iterator) <  2)
+Requires:       (php-composer(phpunit/php-token-stream) >= 3.0             with php-composer(phpunit/php-token-stream) <  4)
+Requires:       (php-composer(phpunit/php-text-template) >= 1.2.1          with php-composer(phpunit/php-text-template) <  2)
+Requires:       (php-composer(sebastian/code-unit-reverse-lookup) >= 1.0.1 with php-composer(sebastian/code-unit-reverse-lookup) <  2)
+Requires:       (php-composer(sebastian/environment) >= 3.0                with php-composer(sebastian/environment) <  4)
+Requires:       (php-composer(sebastian/version) >= 2.0.1                  with php-composer(sebastian/version) <  3)
+Requires:       (php-composer(theseer/tokenizer) >= 1.1                    with php-composer(theseer/tokenizer) <  2)
+%else
+Requires:       php-phpunit-File-Iterator              >= 1.4.2
+Requires:       php-phpunit-php-token-stream3
+Requires:       php-phpunit-Text-Template              >= 1.2.1
+Requires:       php-sebastian-code-unit-reverse-lookup >= 1.0.1
+Requires:       php-sebastian-environment3
+Requires:       php-phpunit-Version                    >= 2.0.1
+Requires:       php-theseer-tokenizer                  >= 1.1
+%endif
 # From composer.json, suggest
 #        "ext-xdebug": ">=2.5.5",
 # From phpcompatinfo report for version 5.0.0
@@ -189,11 +195,11 @@ define('TEST_FILES_PATH', __DIR__ . '/_files/');
 EOF
 
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php71 php72; do
   if which $cmd; then
     $cmd $EXT \
       -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \
-        %{_bindir}/phpunit6 \
+        %{_bindir}/phpunit7 \
           --verbose || ret=1
   fi
 done
@@ -211,6 +217,16 @@ exit $ret
 
 
 %changelog
+* Fri Feb  2 2018 Remi Collet <remi@remirepo.net> - 6.0.1-1
+- Update to 6.0.1
+- rename to php-phpunit-php-code-coverage6
+- move to /usr/share/php/SebastianBergmann/CodeCoverage6
+- raise dependency on PHP 7.1
+- raise dependency on phpunit/php-token-stream 3.0
+- use range dependencies on F27+
+- use phpunit7
+- bootstrap build
+
 * Thu Dec  7 2017 Remi Collet <remi@remirepo.net> - 5.3.0-1
 - Update to 5.3.0