From ba844b17185f8049d14615e5a2df86bbf768da7c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 May 2018 06:11:03 +0200 Subject: update to 1.8.0 (no change) raise dependency on PHP 7.1 use phpunit7 --- php-myclabs-deep-copy.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/php-myclabs-deep-copy.spec b/php-myclabs-deep-copy.spec index 6d676b3..7df5007 100644 --- a/php-myclabs-deep-copy.spec +++ b/php-myclabs-deep-copy.spec @@ -16,7 +16,7 @@ Name: php-myclabs-deep-copy Version: 1.8.0 -Release: 0%{?dist} +Release: 1%{?dist} Summary: Create deep copies (clones) of your objects Group: Development/Libraries @@ -37,11 +37,18 @@ BuildRequires: php-spl # "doctrine/collections": "^1.0", # "doctrine/common": "^2.6", # "phpunit/phpunit": "^7.1" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(doctrine/collections) >= 1.0 with php-composer(doctrine/collections) < 2) +BuildRequires: (php-composer(doctrine/common) >= 2.6 with php-composer(doctrine/common) < 3) +# remirepo:6 +%else BuildRequires: php-composer(doctrine/collections) < 2 BuildRequires: php-composer(doctrine/collections) >= 1.0 BuildRequires: php-composer(doctrine/common) < 3 BuildRequires: php-composer(doctrine/common) >= 2.6 -BuildRequires: phpunit6 +%endif +BuildRequires: phpunit7 >= 7.1 # Required by autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -49,8 +56,9 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": "^7.1" Requires: php(language) >= 7.1 -# From phpcompatinfo report for version 1.3.0 +# From phpcompatinfo report for version 1.8.0 Requires: php-reflection +Requires: php-date Requires: php-spl # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -95,8 +103,7 @@ ret=0 for cmd in php php71 php72; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{gh_project}/autoload.php \ - -d include_path=.:%{buildroot}%{php_home}:%{php_home} \ - %{_bindir}/phpunit6 --verbose || ret=1 + %{_bindir}/phpunit7 --verbose || ret=1 fi done exit $ret @@ -114,6 +121,11 @@ exit $ret %changelog +* Wed May 30 2018 Remi Collet - 1.8.0-1 +- update to 1.8.0 (no change) +- raise dependency on PHP 7.1 +- use phpunit7 + * Wed May 30 2018 Remi Collet - 1.8.0-0 - update to 1.8.0 (no change) - boostrap build using phpunit6 (rely on include_path) -- cgit