use range dependencies on F27+

1 files changed, 16 insertions, 11 deletions

diff --git a/php-phpunit-PHP-Invoker.spec b/php-phpunit-PHP-Invoker.spec
index 63f9b4f..7cff27e 100644
--- a/php-phpunit-PHP-Invoker.spec
+++ b/php-phpunit-PHP-Invoker.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-phpunit-PHP-Invoker
 #
-# Copyright (c) 2011-2017 Remi Collet
+# Copyright (c) 2011-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -22,20 +22,23 @@
 
 Name:           php-phpunit-PHP-Invoker
 Version:        1.1.4
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        Utility class for invoking callables with a timeout
 
-Group:          Development/Libraries
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.2.7
 BuildRequires:  %{_bindir}/phpab
 %if %{with_tests}
 BuildRequires:  %{_bindir}/phpunit
+%if 0%{?fedora} >= 27
+BuildRequires:  (php-composer(phpunit/php-timer) >= 1.0.6 with php-composer(phpunit/php-timer) < 2)
+%else
+BuildRequires:  php-phpunit-PHP-Timer >= 1.0.6
+%endif
 %endif
 
 # From composer.json
@@ -43,7 +46,12 @@ BuildRequires:  %{_bindir}/phpunit
 #        "phpunit/php-timer": ">=1.0.6",
 #        "ext-pcntl": "*"
 Requires:       php(language) >= 5.3.3
-Requires:       php-composer(phpunit/php-timer) >= 1.0.6
+%if 0%{?fedora} >= 27
+Requires:       (php-composer(phpunit/php-timer) >= 1.0.6 with php-composer(phpunit/php-timer) < 2)
+%else
+Requires:       php-phpunit-PHP-Timer >= 1.0.6
+%endif
+
 Requires:       php-pcntl
 # From phpcompatinfo report for version 1.0.5
 Requires:       php-spl
@@ -83,7 +91,6 @@ EOF
 
 
 %install
-rm -rf     %{buildroot}
 mkdir -p   %{buildroot}%{php_home}
 cp -pr PHP %{buildroot}%{php_home}
 
@@ -103,10 +110,6 @@ cp -pr PHP %{buildroot}%{php_home}
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
 if [ -x %{_bindir}/pear ]; then
    %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only \
@@ -114,7 +117,6 @@ if [ -x %{_bindir}/pear ]; then
 fi
 
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc README.md
@@ -123,6 +125,9 @@ fi
 
 
 %changelog
+* Fri Feb  2 2018 Remi Collet <remi@remirepo.net> - 1.1.4-5
+- use range dependencies on F27+
+
 * Sun Jun 21 2015 Remi Collet <remi@fedoraproject.org> - 1.1.4-1
 - update to 1.1.4
 - raise dependencies on PHP >= 5.3.3 and php-timer >= 1.0.6