diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-zetacomponents-console-tools.spec | 48 |
2 files changed, 23 insertions, 27 deletions
diff --git a/composer.json b/composer.json index 2960440..4fca57d 100644 --- a/composer.json +++ b/composer.json @@ -50,7 +50,7 @@ "zetacomponents/base": "~1.8" }, "require-dev": { - "phpunit/phpunit": "~8.0", + "phpunit/phpunit": "~9.0", "zetacomponents/unit-test": "*" } } diff --git a/php-zetacomponents-console-tools.spec b/php-zetacomponents-console-tools.spec index d2d081c..5de75c2 100644 --- a/php-zetacomponents-console-tools.spec +++ b/php-zetacomponents-console-tools.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-zetacomponents-console-tools # -# Copyright (c) 2015-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2015-2024 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit fbc31f1be66ccd178c68d846d7c0ae09dbb97c89 +%global gh_commit de081f422b574d638e62e15661bf833d80fac61a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zetacomponents %global gh_project ConsoleTools @@ -22,13 +22,13 @@ %bcond_without phpab Name: php-%{gh_owner}-%{cname} -Version: 1.7.3 -Release: 3%{?dist} +Version: 1.7.5 +Release: 1%{?dist} Summary: Zeta %{gh_project} Component -License: ASL 2.0 +License: Apache-2.0 URL: http://zetacomponents.org/ -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz Source1: autoloader.php BuildArch: noarch @@ -36,29 +36,17 @@ 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": "~8.0", +# "phpunit/phpunit": "~9.0", # "zetacomponents/unit-test": "*" BuildRequires: phpunit9 -BuildRequires: php-composer(%{gh_owner}/unit-test) >= 1.2.0 +BuildRequires: php-composer(%{gh_owner}/unit-test) >= 1.2.4 %endif # 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 @@ -128,12 +116,10 @@ EOF : Drop assertion which rely on path in sources dir sed -e '/realpath/d' -i tests/statusbar_test.php -: Not ready for phpunit9 -rm tests/option_test.php tests/arguments_test.php : Run test test suite -for cmd in php php74 php80 php81 +for cmd in php php81 php82 php83 php84 do if which $cmd; then @@ -146,8 +132,6 @@ done %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE* CREDITS %doc ChangeLog %doc composer.json @@ -159,6 +143,18 @@ done %changelog +* Mon Oct 7 2024 Remi Collet <remi@remirepo.net> - 1.7.5-1 +- update to 1.7.5 + +* Wed Jan 31 2024 Remi Collet <remi@remirepo.net> - 1.7.4-1 +- update to 1.7.4 +- drop patch merged upstream + +* Wed Jan 31 2024 Remi Collet <remi@remirepo.net> - 1.7.3-8 +- add upstream patch for PHP 8.2 +- add patch for PHP 8.3 from https://github.com/zetacomponents/ConsoleTools/pull/26 +- fix FTBFS #2261516 + * Tue Jul 19 2022 Remi Collet <remi@remirepo.net> - 1.7.3-3 - switch to phpunit9 |