v5.3.2HEADmaster

1 files changed, 44 insertions, 35 deletions

diff --git a/php-phpunit-php-code-coverage5.spec b/php-phpunit-php-code-coverage5.spec
index 6b01829..f022804 100644
--- a/php-phpunit-php-code-coverage5.spec
+++ b/php-phpunit-php-code-coverage5.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-phpunit-php-code-coverage5
 #
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -9,7 +9,7 @@
 
 %global bootstrap    0
 # Github
-%global gh_commit    661f34d0bd3f1a7225ef491a70a020ad23a057a1
+%global gh_commit    c89677919c5dd6d3b3852f230a663118762218ac
 #global gh_date      20150924
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    sebastianbergmann
@@ -23,7 +23,7 @@
 %global php_home     %{_datadir}/php
 %global ver_major    5
 %global ver_minor    3
-%global ver_patch    0
+%global ver_patch    2
 %global specrel      1
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
@@ -52,20 +52,23 @@ 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
+%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) >= 2.0.1           with php-composer(phpunit/php-token-stream) <  3)
+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-stream2          >= 2.0.1
+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
@@ -86,20 +89,23 @@ BuildRequires:  php-pecl-xdebug  >= 2.5.5
 Requires:       php(language) >= 7.0
 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) >= 2.0.1           with php-composer(phpunit/php-token-stream) <  3)
+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-stream2
+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
@@ -157,10 +163,7 @@ rm src/Report/Html/Renderer/Template/fonts/glyphicons-halflings-regular.ttf
 cat << 'EOF' | tee -a src/autoload.php
 \Fedora\Autoloader\Dependencies::required([
 	'File/Iterator/Autoload.php',
-    [
-        'SebastianBergmann/PhpTokenStream2/autoload.php',
-        'PHP/Token/Stream/Autoload.php',
-    ],
+    'SebastianBergmann/PhpTokenStream2/autoload.php',
     'Text/Template/Autoload.php',
     '%{ns_vendor}/CodeUnitReverseLookup/autoload.php',
     '%{ns_vendor}/Environment3/autoload.php',
@@ -211,6 +214,12 @@ exit $ret
 
 
 %changelog
+* Mon Apr  9 2018 Remi Collet <remi@remirepo.net> - 5.3.2-1
+- update to 5.3.2
+
+* Fri Feb  2 2018 Remi Collet <remi@remirepo.net> - 5.3.0-2
+- use range dependency on F27+
+
 * Thu Dec  7 2017 Remi Collet <remi@remirepo.net> - 5.3.0-1
 - Update to 5.3.0