diff options
| author | Remi Collet <remi@remirepo.net> | 2021-08-11 15:48:01 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-08-11 15:48:01 +0200 |
| commit | e3d442869abc9f5ca89b4c887d3d9abaf908d4e6 (patch) | |
| tree | f7a2dedfab47e479d6c16c3f3cd28b5a4f38dd43 /php-doctrine-collections.spec | |
| parent | 2a47e898457f64ce4aff6bb7d30c15a542e575d8 (diff) | |
update to 1.6.8
Diffstat (limited to 'php-doctrine-collections.spec')
| -rw-r--r-- | php-doctrine-collections.spec | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/php-doctrine-collections.spec b/php-doctrine-collections.spec index c3ddf18..8ceed23 100644 --- a/php-doctrine-collections.spec +++ b/php-doctrine-collections.spec @@ -12,8 +12,8 @@ %global github_owner doctrine %global github_name collections -%global github_version 1.6.7 -%global github_commit 55f8b799269a1a472457bd1a41b4f379d4cfba4a +%global github_version 1.6.8 +%global github_commit 1958a744696c6bb3bb0d28db2611dc11610e78af %global composer_vendor doctrine %global composer_project collections @@ -39,18 +39,11 @@ URL: https://github.com/%{github_owner}/%{github_name} Source0: %{name}-%{github_version}-%{github_commit}.tar.gz Source1: %{name}-get-source.sh -# Upstream patch for PHPUnit >= 8 -Patch0: %{name}-phpunit.patch - BuildArch: noarch # Tests %if %{with tests} ## composer.json -%if 0%{?fedora} >= 32 %global phpunit %{_bindir}/phpunit9 -%else -%global phpunit %{_bindir}/phpunit8 -%endif BuildRequires: %{phpunit} BuildRequires: php(language) >= %{php_min_ver} ## phpcompatinfo (computed from version 1.6.0) @@ -82,7 +75,6 @@ Autoloader: %{phpdir}/Doctrine/Common/Collections/autoload.php %prep %setup -qn %{github_name}-%{github_commit} -%patch0 -p1 %build @@ -115,10 +107,10 @@ BOOTSTRAP : Upstream tests SCL_RETURN_CODE=0 -for CMD in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74 "php80 %{_bindir}/phpunit9"; do +for CMD in "php %{phpunit}" php73 php74 php80 php81; do if which $CMD; then set $CMD - $1 ${2:-%{_bindir}/phpunit8} --verbose --bootstrap bootstrap.php \ + $1 ${2:-%{_bindir}/phpunit9} --verbose --bootstrap bootstrap.php \ || SCL_RETURN_CODE=1 fi done @@ -140,6 +132,9 @@ exit $SCL_RETURN_CODE %changelog +* Wed Aug 11 2021 Remi Collet <remi@remirepo.net> - 1.6.8-1 +- update to 1.6.8 + * Tue Aug 11 2020 Remi Collet <remi@remirepo.net> - 1.6.7-1 - update to 1.6.7 - add upstream patch for recent PHPUnit |