use package names on EL and Fedora < 27

1 files changed, 41 insertions, 79 deletions

diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index ac939e2..30705d4 100644
--- a/php-phpunit-PHPUnit.spec
+++ b/php-phpunit-PHPUnit.spec
@@ -22,7 +22,7 @@
 %global pear_channel pear.phpunit.de
 %global major        5.7
 %global minor        27
-%global specrel      1
+%global specrel      2
 
 Name:           php-phpunit-PHPUnit
 Version:        %{major}.%{minor}
@@ -45,7 +45,6 @@ Source2:        %{gh_project}-5.4.0-Autoload.php.in
 # Fix command for autoload
 Patch0:         %{gh_project}-rpm.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.6
 BuildRequires:  %{_bindir}/phpab
@@ -69,42 +68,26 @@ BuildRequires:  (php-composer(phpunit/php-invoker) >= 1.1           with php-com
 BuildRequires:  (php-composer(doctrine/instantiator) >= 1.0.4       with php-composer(doctrine/instantiator) <  2)
 BuildRequires:  (php-composer(sebastian/recursion-context) >= 2.0   with php-composer(sebastian/recursion-context) <  3)
 %else
-BuildRequires:  php-composer(phpunit/php-file-iterator) <  2
-BuildRequires:  php-composer(phpunit/php-file-iterator) >= 1.4
-BuildRequires:  php-composer(phpunit/php-text-template) <  2
-BuildRequires:  php-composer(phpunit/php-text-template) >= 1.2
-BuildRequires:  php-composer(phpunit/php-code-coverage) <  5
-BuildRequires:  php-composer(phpunit/php-code-coverage) >= 4.0.4
-BuildRequires:  php-composer(phpunit/php-timer) <  2
-BuildRequires:  php-composer(phpunit/php-timer) >= 1.0.6
-BuildRequires:  php-composer(phpunit/phpunit-mock-objects) <  4
-BuildRequires:  php-composer(phpunit/phpunit-mock-objects) >= 3.2
-BuildRequires:  php-composer(phpspec/prophecy) >= 1.6.2
-BuildRequires:  php-composer(sebastian/comparator) <  2
-BuildRequires:  php-composer(sebastian/comparator) >= 1.2.4
-BuildRequires:  php-composer(sebastian/diff) >= 1.4.3
-BuildRequires:  php-composer(sebastian/environment) <  3
-BuildRequires:  php-composer(sebastian/environment) >= 1.3.4
-BuildRequires:  php-composer(sebastian/exporter) < 3
-BuildRequires:  php-composer(sebastian/exporter) >= 2.0
-BuildRequires:  php-composer(sebastian/recursion-context) <  3
-BuildRequires:  php-composer(sebastian/recursion-context) >= 2.0
-BuildRequires:  php-composer(sebastian/global-state) <  2
-BuildRequires:  php-composer(sebastian/global-state) >= 1.1
-BuildRequires:  php-composer(sebastian/object-enumerator) <  3
-BuildRequires:  php-composer(sebastian/object-enumerator) >= 2.0
-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(myclabs/deep-copy) <  2
-BuildRequires:  php-composer(myclabs/deep-copy) >= 1.3
-BuildRequires:  php-symfony-yaml
-BuildRequires:  php-composer(phpunit/php-invoker) <  2
-BuildRequires:  php-composer(phpunit/php-invoker) >= 1.1.0
-BuildRequires:  php-composer(doctrine/instantiator) <  2
-BuildRequires:  php-composer(doctrine/instantiator) >= 1.0.4
+BuildRequires:  php-phpunit-File-Iterator         >= 1.4
+BuildRequires:  php-phpunit-Text-Template         >= 1.2
+BuildRequires:  php-phpunit-PHP-CodeCoverage      >= 4.0.4
+BuildRequires:  php-phpunit-PHP-Timer             >= 1.0.6
+BuildRequires:  php-phpunit-PHPUnit-MockObject    >= 3.2
+BuildRequires:  php-phpspec-prophecy              >= 1.6.2
+BuildRequires:  php-phpunit-comparator            >= 1.2.4
+BuildRequires:  php-phpunit-diff                  >= 1.4.3
+BuildRequires:  php-phpunit-environment           >= 1.3.4
+BuildRequires:  php-phpunit-exporter
+BuildRequires:  php-sebastian-global-state        >= 1.1
+BuildRequires:  php-sebastian-object-enumerator
+BuildRequires:  php-sebastian-resource-operations
+BuildRequires:  php-phpunit-Version               >= 2.0.1
+BuildRequires:  php-myclabs-deep-copy             >= 1.3
+BuildRequires:  php-phpunit-PHP-Invoker           >= 1.1
+BuildRequires:  php-doctrine-instantiator         >= 1.0.4
+BuildRequires:  php-sebastian-recursion-context
 %endif
+BuildRequires:  php-symfony-yaml
 # Autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 
@@ -150,36 +133,21 @@ Requires:       (php-composer(sebastian/resource-operations) >= 1.0 with php-com
 Requires:       (php-composer(sebastian/version) >= 2.0.1           with php-composer(sebastian/version) <  3)
 Requires:       (php-composer(myclabs/deep-copy) >= 1.3             with php-composer(myclabs/deep-copy) <  2)
 %else
-Requires:       php-composer(phpunit/php-file-iterator) <  2
-Requires:       php-composer(phpunit/php-file-iterator) >= 1.4
-Requires:       php-composer(phpunit/php-text-template) <  2
-Requires:       php-composer(phpunit/php-text-template) >= 1.2
-Requires:       php-composer(phpunit/php-code-coverage) <  5
-Requires:       php-composer(phpunit/php-code-coverage) >= 4.0.4
-Requires:       php-composer(phpunit/php-timer) <  2
-Requires:       php-composer(phpunit/php-timer) >= 1.0.6
-Requires:       php-composer(phpunit/phpunit-mock-objects) <  4
-Requires:       php-composer(phpunit/phpunit-mock-objects) >= 3.2
-Requires:       php-composer(phpspec/prophecy) <  2
-Requires:       php-composer(phpspec/prophecy) >= 1.6.2
-Requires:       php-composer(sebastian/comparator) <  2
-Requires:       php-composer(sebastian/comparator) >= 1.2.4
-Requires:       php-composer(sebastian/diff) <  2
-Requires:       php-composer(sebastian/diff) >= 1.4.3
-Requires:       php-composer(sebastian/environment) <  3
-Requires:       php-composer(sebastian/environment) >= 1.3.4
-Requires:       php-composer(sebastian/exporter) <  3
-Requires:       php-composer(sebastian/exporter) >= 2.0
-Requires:       php-composer(sebastian/global-state) <  2
-Requires:       php-composer(sebastian/global-state) >= 1.1
-Requires:       php-composer(sebastian/object-enumerator) <  3
-Requires:       php-composer(sebastian/object-enumerator) >= 2.0
-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(myclabs/deep-copy) <  2
-Requires:       php-composer(myclabs/deep-copy) >= 1.3
+Requires:       php-phpunit-File-Iterator         >= 1.4
+Requires:       php-phpunit-Text-Template         >= 1.2
+Requires:       php-phpunit-PHP-CodeCoverage      >= 4.0.4
+Requires:       php-phpunit-PHP-Timer             >= 1.0.6
+Requires:       php-phpunit-PHPUnit-MockObject    >= 3.2
+Requires:       php-phpspec-prophecy              >= 1.6.2
+Requires:       php-phpunit-comparator            >= 1.2.4
+Requires:       php-phpunit-diff                  >= 1.4.3
+Requires:       php-phpunit-environment           >= 1.3.4
+Requires:       php-phpunit-exporter
+Requires:       php-sebastian-global-state        >= 1.1
+Requires:       php-sebastian-object-enumerator
+Requires:       php-sebastian-resource-operations
+Requires:       php-phpunit-Version               >= 2.0.1
+Requires:       php-myclabs-deep-copy             >= 1.3
 %endif
 Requires:       php-symfony-yaml
 Requires:       php-dom
@@ -196,12 +164,9 @@ Requires:       (php-composer(phpunit/php-invoker) >= 1.1           with php-com
 Requires:       (php-composer(doctrine/instantiator) >= 1.0.4       with php-composer(doctrine/instantiator) <  2)
 Requires:       (php-composer(sebastian/recursion-context) >= 2.0   with php-composer(sebastian/recursion-context) <  3)
 %else
-Requires:       php-composer(phpunit/php-invoker) <  2
-Requires:       php-composer(phpunit/php-invoker) >= 1.1
-Requires:       php-composer(doctrine/instantiator) <  2
-Requires:       php-composer(doctrine/instantiator) >= 1.0.4
-Requires:       php-composer(sebastian/recursion-context) <  3
-Requires:       php-composer(sebastian/recursion-context) >= 2.0
+Requires:       php-phpunit-PHP-Invoker           >= 1.1
+Requires:       php-doctrine-instantiator         >= 1.0.4
+Requires:       php-sebastian-recursion-context
 %endif
 Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 5.6.0
@@ -254,7 +219,6 @@ mv src PHPUnit
 
 
 %install
-rm -rf         %{buildroot}
 mkdir -p       %{buildroot}%{php_home}
 cp -pr PHPUnit %{buildroot}%{php_home}/PHPUnit
 
@@ -273,10 +237,6 @@ done
 exit $ret
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
 if [ -x %{_bindir}/pear ]; then
    %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only \
@@ -285,7 +245,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc README.md composer.json ChangeLog-%{major}.md
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
@@ -295,6 +254,9 @@ fi
 
 
 %changelog
+* Fri Feb  2 2018 Remi Collet <remi@remirepo.net> - 5.7.27-2
+- use package names on EL and Fedora < 27
+
 * Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 5.7.27-1
 - Update to 5.7.27
 - raise dependency on sebastian/version 2.0.1