From 4b275c7d2bcd30bff4b1c4a22add7fd3ef667860 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Jun 2022 13:04:20 +0200 Subject: allow brick/math 0.10 --- php-ramsey-uuid.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/php-ramsey-uuid.spec b/php-ramsey-uuid.spec index 1c02fb4..ed5f969 100644 --- a/php-ramsey-uuid.spec +++ b/php-ramsey-uuid.spec @@ -23,7 +23,7 @@ Name: php-%{pk_vendor}-%{pk_name} Version: 4.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for generating and working with UUIDs License: MIT @@ -65,7 +65,7 @@ BuildRequires: php-spl %if %{with tests} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(brick/math) >= 0.8 with php-composer(brick/math) < 0.10) +BuildRequires: (php-composer(brick/math) >= 0.8 with php-composer(brick/math) < 1) BuildRequires: (php-composer(ramsey/collection) >= 1.0 with php-composer(ramsey/collection) < 2) BuildRequires: (php-composer(symfony/polyfill-php80) >= 1.14 with php-composer(symfony/polyfill-php80) < 2) BuildRequires: (php-composer(mockery/mockery) >= 1.3 with php-composer(mockery/mockery) < 2) @@ -96,7 +96,7 @@ Requires: php-ctype Requires: php-json # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(brick/math) >= 0.8 with php-composer(brick/math) < 0.10) +Requires: (php-composer(brick/math) >= 0.8 with php-composer(brick/math) < 1) Requires: (php-composer(ramsey/collection) >= 1.0 with php-composer(ramsey/collection) < 2) Requires: (php-composer(symfony/polyfill-php80) >= 1.14 with php-composer(symfony/polyfill-php80) < 2) # remirepo:5 @@ -167,14 +167,16 @@ EOF : Ignore tests using missing mocking libraries find tests -type f -exec grep -Eq '(PHPMockery|Aspec|Moontoast)' {} \; -delete -print -: Ignore test with erratic result on Koji -FILTER="--filter '^((?!(testSerializationOfNodeProviderCollection)).)*$'" +: Ignore tests +# testSerializationOfNodeProviderCollection: erratic result on Koji +# testGetLocalDomainAndIdentifier: https://github.com/ramsey/uuid/issues/425 +FILTER="--filter '^((?!(testSerializationOfNodeProviderCollection|testGetLocalDomainAndIdentifier)).)*$'" : Test failing with recent depdencies rm tests/Generator/RandomLibAdapterTest.php : Run upstream test suite ret=0 -for cmdarg in "php %{?phpunit}" php73 php74 php80 php81; do +for cmdarg in "php %{?phpunit}" php74 php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -197,6 +199,9 @@ exit $ret %changelog +* Mon Jun 20 2022 Remi Collet - 4.2.3-2 +- allow brick/math 0.10 + * Mon Sep 27 2021 Remi Collet - 4.2.3-1 - update to 4.2.3 - add dependency on php-symfony-polyfill -- cgit