From 480b0f215f52c128075b3a4bf366d5cf55a631e7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Oct 2024 09:28:45 +0200 Subject: update to 1.7.5 --- php-zetacomponents-console-tools.spec | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/php-zetacomponents-console-tools.spec b/php-zetacomponents-console-tools.spec index 2d5bba5..5de75c2 100644 --- a/php-zetacomponents-console-tools.spec +++ b/php-zetacomponents-console-tools.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # -%global gh_commit c487720bffd26e74a297c3baa31a9b90580759b2 +%global gh_commit de081f422b574d638e62e15661bf833d80fac61a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zetacomponents %global gh_project ConsoleTools @@ -22,7 +22,7 @@ %bcond_without phpab Name: php-%{gh_owner}-%{cname} -Version: 1.7.4 +Version: 1.7.5 Release: 1%{?dist} Summary: Zeta %{gh_project} Component @@ -36,13 +36,7 @@ BuildArch: noarch BuildRequires: %{_bindir}/phpab %endif %if %{with tests} -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(%{gh_owner}/base) >= 1.8 with php-composer(%{gh_owner}/base) < 2) -# remirepo:3 -%else -BuildRequires: php-zetacomponents-base >= 1.8 -%endif # From composer.json, "require-dev": { # "phpunit/phpunit": "~9.0", # "zetacomponents/unit-test": "*" @@ -52,13 +46,7 @@ BuildRequires: php-composer(%{gh_owner}/unit-test) >= 1.2.4 # From composer.json, "require": { # "zetacomponents/base": "~1.8" -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(%{gh_owner}/base) >= 1.8 with php-composer(%{gh_owner}/base) < 2) -# remirepo:3 -%else -Requires: php-zetacomponents-base >= 1.8 -%endif # From phpcompatinfo report for 1.7 Requires: php(language) > 5.3 Requires: php-iconv @@ -131,7 +119,7 @@ sed -e '/realpath/d' -i tests/statusbar_test.php : Run test test suite -for cmd in php php81 php82 php83 +for cmd in php php81 php82 php83 php84 do if which $cmd; then @@ -144,8 +132,6 @@ done %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE* CREDITS %doc ChangeLog %doc composer.json @@ -157,6 +143,9 @@ done %changelog +* Mon Oct 7 2024 Remi Collet - 1.7.5-1 +- update to 1.7.5 + * Wed Jan 31 2024 Remi Collet - 1.7.4-1 - update to 1.7.4 - drop patch merged upstream -- cgit