From 3f020881d731c493dc4d3ab9d924fa7589f8049e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Oct 2023 14:04:41 +0200 Subject: update to 1.7.23 (no change) --- php-tecnickcom-tc-lib-pdf-graph.spec | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/php-tecnickcom-tc-lib-pdf-graph.spec b/php-tecnickcom-tc-lib-pdf-graph.spec index 3ffa853..f47a5d1 100644 --- a/php-tecnickcom-tc-lib-pdf-graph.spec +++ b/php-tecnickcom-tc-lib-pdf-graph.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit db2b4a404602052392f7ab20814765f1505494fe +%global gh_commit d523e098ddb69e71e1043958dbb97e2dbbfc93a5 %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.21 +Version: 1.7.23 Release: 1%{?dist} Summary: PHP library containing PDF graphic and geometric methods @@ -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 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(%{c_vendor}/tc-lib-color) >= 1.14 with php-composer(%{c_vendor}/tc-lib-color) < 2) @@ -105,11 +112,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 @@ -119,15 +127,19 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json -%doc README.md +%doc *.md %dir %{_datadir}/php/Com/Tecnick/Pdf %{php_project} %changelog +* Mon Oct 23 2023 Remi Collet - 1.7.23-1 +- update to 1.7.23 (no change) + * Thu Oct 12 2023 Remi Collet - 1.7.21-1 - update to 1.7.21 -- cgit