use package names on EL and Fedora < 27

1 files changed, 41 insertions, 74 deletions

diff --git a/phpunit6.spec b/phpunit6.spec
index 307f350..16046e2 100644
--- a/phpunit6.spec
+++ b/phpunit6.spec
@@ -25,7 +25,7 @@
 %global ver_major    6
 %global ver_minor    5
 %global ver_patch    6
-%global specrel      1
+%global specrel      2
 
 Name:           %{pk_project}%{ver_major}
 Version:        %{ver_major}.%{ver_minor}.%{ver_patch}
@@ -62,42 +62,24 @@ BuildRequires:  (php-composer(sebastian/resource-operations) >= 1.0  with php-co
 BuildRequires:  (php-composer(sebastian/version) >= 2.0.1            with php-composer(sebastian/version) <  3)
 BuildRequires:  (php-composer(phpunit/php-invoker) <  2              with php-composer(phpunit/php-invoker) >= 1.1)
 %else
-BuildRequires:  php-composer(myclabs/deep-copy) <  2
-BuildRequires:  php-composer(myclabs/deep-copy) >= 1.6.1
-BuildRequires:  php-composer(phar-io/manifest) <  2
-BuildRequires:  php-composer(phar-io/manifest) >= 1.0.1
-BuildRequires:  php-composer(phar-io/version) <  2
-BuildRequires:  php-composer(phar-io/version) >= 1.0
-BuildRequires:  php-composer(phpspec/prophecy) <  2
-BuildRequires:  php-composer(phpspec/prophecy) >= 1.7
-BuildRequires:  php-composer(phpunit/php-code-coverage) <  6
-BuildRequires:  php-composer(phpunit/php-code-coverage) >= 5.3
-BuildRequires:  php-composer(phpunit/php-file-iterator) <  2
-BuildRequires:  php-composer(phpunit/php-file-iterator) >= 1.4.3
-BuildRequires:  php-composer(phpunit/php-text-template) <  2
-BuildRequires:  php-composer(phpunit/php-text-template) >= 1.2.1
-BuildRequires:  php-composer(phpunit/php-timer) <  2
-BuildRequires:  php-composer(phpunit/php-timer) >= 1.0.9
-BuildRequires:  php-composer(phpunit/phpunit-mock-objects) <  6
-BuildRequires:  php-composer(phpunit/phpunit-mock-objects) >= 5.0.5
-BuildRequires:  php-composer(sebastian/comparator) <  3
-BuildRequires:  php-composer(sebastian/comparator) >= 2.0.2
-BuildRequires:  php-composer(sebastian/diff) <  3
-BuildRequires:  php-composer(sebastian/diff) >= 2.0
-BuildRequires:  php-composer(sebastian/environment) <  4
-BuildRequires:  php-composer(sebastian/environment) >= 3.1
-BuildRequires:  php-composer(sebastian/exporter) <  4
-BuildRequires:  php-composer(sebastian/exporter) >= 3.1
-BuildRequires:  php-composer(sebastian/global-state) <  3
-BuildRequires:  php-composer(sebastian/global-state) >= 2.0
-BuildRequires:  php-composer(sebastian/object-enumerator) <  4
-BuildRequires:  php-composer(sebastian/object-enumerator) >= 3.0.3
-BuildRequires:  php-composer(sebastian/resource-operations) <  2
-BuildRequires:  php-composer(sebastian/resource-operations) >= 1.0
-BuildRequires:  php-composer(sebastian/version) <  3
-BuildRequires:  php-composer(sebastian/version) >= 2.0.1
-BuildRequires:  php-composer(phpunit/php-invoker) <  2
-BuildRequires:  php-composer(phpunit/php-invoker) >= 1.1.0
+BuildRequires:  php-myclabs-deep-copy                       >= 1.6.1
+BuildRequires:  php-phar-io-manifest                        >= 1.0.1
+BuildRequires:  php-phar-io-version                         >= 1.0
+BuildRequires:  php-phpspec-prophecy                        >= 1.7
+BuildRequires:  php-phpunit-php-code-coverage5              >= 5.3
+BuildRequires:  php-phpunit-File-Iterator                   >= 1.4.3
+BuildRequires:  php-phpunit-Text-Template                   >= 1.2.1
+BuildRequires:  php-phpunit-PHP-Timer                       >= 1.0.9
+BuildRequires:  php-phpunit-mock-objects5                   >= 5.0.5
+BuildRequires:  php-sebastian-comparator2                   >= 2.0.2
+BuildRequires:  php-sebastian-diff2
+BuildRequires:  php-sebastian-environment3                  >= 3.1
+BuildRequires:  php-sebastian-exporter3                     >= 3.1
+BuildRequires:  php-sebastian-global-state2
+BuildRequires:  php-sebastian-object-enumerator3            >= 3.0.3
+BuildRequires:  php-sebastian-resource-operations
+BuildRequires:  php-phpunit-Version                         >= 2.0.1
+BuildRequires:  php-phpunit-PHP-Invoker                     >= 1.1
 %endif
 BuildRequires:  php-dom
 BuildRequires:  php-json
@@ -161,42 +143,24 @@ Requires:       (php-composer(sebastian/version) >= 2.0.1            with php-co
 #        "ext-xdebug": "*"
 Requires:       (php-composer(phpunit/php-invoker) <  2              with php-composer(phpunit/php-invoker) >= 1.1)
 %else
-Requires:       php-composer(myclabs/deep-copy) <  2
-Requires:       php-composer(myclabs/deep-copy) >= 1.6.1
-Requires:       php-composer(phar-io/manifest) <  2
-Requires:       php-composer(phar-io/manifest) >= 1.0.1
-Requires:       php-composer(phar-io/version) <  2
-Requires:       php-composer(phar-io/version) >= 1.0
-Requires:       php-composer(phpspec/prophecy) <  2
-Requires:       php-composer(phpspec/prophecy) >= 1.7
-Requires:       php-composer(phpunit/php-code-coverage) <  6
-Requires:       php-composer(phpunit/php-code-coverage) >= 5.3
-Requires:       php-composer(phpunit/php-file-iterator) <  2
-Requires:       php-composer(phpunit/php-file-iterator) >= 1.4.3
-Requires:       php-composer(phpunit/php-text-template) <  2
-Requires:       php-composer(phpunit/php-text-template) >= 1.2.1
-Requires:       php-composer(phpunit/php-timer) <  2
-Requires:       php-composer(phpunit/php-timer) >= 1.0.9
-Requires:       php-composer(phpunit/phpunit-mock-objects) <  6
-Requires:       php-composer(phpunit/phpunit-mock-objects) >= 5.0.5
-Requires:       php-composer(sebastian/comparator) <  3
-Requires:       php-composer(sebastian/comparator) >= 2.0.2
-Requires:       php-composer(sebastian/diff) <  3
-Requires:       php-composer(sebastian/diff) >= 2.0
-Requires:       php-composer(sebastian/environment) <  4
-Requires:       php-composer(sebastian/environment) >= 3.1
-Requires:       php-composer(sebastian/exporter) <  4
-Requires:       php-composer(sebastian/exporter) >= 3.1
-Requires:       php-composer(sebastian/global-state) <  3
-Requires:       php-composer(sebastian/global-state) >= 2.0
-Requires:       php-composer(sebastian/object-enumerator) <  4
-Requires:       php-composer(sebastian/object-enumerator) >= 3.0.3
-Requires:       php-composer(sebastian/resource-operations) <  2
-Requires:       php-composer(sebastian/resource-operations) >= 1.0
-Requires:       php-composer(sebastian/version) <  3
-Requires:       php-composer(sebastian/version) >= 2.0.1
-Requires:       php-composer(phpunit/php-invoker) >= 1.1
-Requires:       php-composer(phpunit/php-invoker) <  2
+Requires:       php-myclabs-deep-copy                       >= 1.6.1
+Requires:       php-phar-io-manifest                        >= 1.0.1
+Requires:       php-phar-io-version                         >= 1.0
+Requires:       php-phpspec-prophecy                        >= 1.7
+Requires:       php-phpunit-php-code-coverage5              >= 5.3
+Requires:       php-phpunit-File-Iterator                   >= 1.4.3
+Requires:       php-phpunit-Text-Template                   >= 1.2.1
+Requires:       php-phpunit-PHP-Timer                       >= 1.0.9
+Requires:       php-phpunit-mock-objects5                   >= 5.0.5
+Requires:       php-sebastian-comparator2                   >= 2.0.2
+Requires:       php-sebastian-diff2
+Requires:       php-sebastian-environment3                  >= 3.1
+Requires:       php-sebastian-exporter3                     >= 3.1
+Requires:       php-sebastian-global-state2
+Requires:       php-sebastian-object-enumerator3            >= 3.0.3
+Requires:       php-sebastian-resource-operations
+Requires:       php-phpunit-Version                         >= 2.0.1
+Requires:       php-phpunit-PHP-Invoker                     >= 1.1
 %endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
@@ -247,8 +211,8 @@ cat << 'EOF' | tee -a src/autoload.php
     'PHP/Timer/Autoload.php',
     '%{ns_vendor}/Framework/MockObject5/autoload.php',
     'Prophecy/autoload.php',
+    'SebastianBergmann/Diff2/autoload.php', // Before comparator which may load v3
     'SebastianBergmann/Comparator2/autoload.php',
-    'SebastianBergmann/Diff2/autoload.php',
     'SebastianBergmann/Environment3/autoload.php',
     'SebastianBergmann/Exporter3/autoload.php',
     'SebastianBergmann/GlobalState2/autoload.php',
@@ -311,6 +275,9 @@ exit $ret
 
 
 %changelog
+* Fri Feb  2 2018 Remi Collet <remi@remirepo.net> - 6.5.6-2
+- use package names on EL and Fedora < 27
+
 * Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 6.5.6-1
 - Update to 6.5.6
 - undefine __brp_mangle_shebangs