From 384c2359934274745dacd0262062bbc8e323e1ec Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Oct 2023 13:57:26 +0200 Subject: update to 1.7.33 (no change) --- php-tecnickcom-tc-lib-unicode-data.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/php-tecnickcom-tc-lib-unicode-data.spec b/php-tecnickcom-tc-lib-unicode-data.spec index 0e806c4..dadf925 100644 --- a/php-tecnickcom-tc-lib-unicode-data.spec +++ b/php-tecnickcom-tc-lib-unicode-data.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit c8e5afc9d176ac27b5c59c2db5ed758625959e2c +%global gh_commit aaef614a8065787ae962e9146ea1eb0dfe74240f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global c_vendor tecnickcom %global gh_owner tecnickcom @@ -15,7 +15,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{gh_project} -Version: 1.7.31 +Version: 1.7.33 Release: 1%{?dist} Summary: PHP library containing UTF-8 font definitions @@ -26,8 +26,15 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit BuildArch: noarch %if %{with_tests} # For tests +# remirepo:1 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 +%global phpunit %{_bindir}/phpunit10 +BuildRequires: phpunit10 +# remirepo:4 +%else %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 >= 9.5.27 +%endif BuildRequires: php(language) >= 5.4 %endif BuildRequires: php-fedora-autoloader-devel @@ -80,11 +87,12 @@ require '%{buildroot}%{php_project}/autoload.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" "php80 %{phpunit}" php81 php82 php83; do +for cmdarg in php "php80 %{_bindir}/phpunit9" php81 php82 php83; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit10} --migrate-configuration || : - $1 ${2:-%{_bindir}/phpunit10} --no-coverage || ret=1 + cp phpunit.xml.dist phpunit.xml + $1 ${2:-%{phpunit}} --migrate-configuration || : + $1 ${2:-%{phpunit}} --no-coverage || ret=1 fi done exit $ret @@ -94,6 +102,7 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json @@ -105,6 +114,9 @@ exit $ret %changelog +* Mon Oct 23 2023 Remi Collet - 1.7.33-1 +- update to 1.7.33 (no change) + * Thu Oct 12 2023 Remi Collet - 1.7.31-1 - update to 1.7.31 -- cgit