From 48f8a761c67434ad4b37d02440c9cc14369555ad Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Feb 2023 13:38:06 +0100 Subject: update to 5.0.0 raise dependency on PHP 8.1 rename to php-sebastian-diff5 move to /usr/share/php/SebastianBergmann/Diff5 --- composer.json | 8 ++++---- php-sebastian-diff5.spec | 37 ++++++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index cf92202..b8e778b 100644 --- a/composer.json +++ b/composer.json @@ -17,16 +17,16 @@ "prefer-stable": true, "config": { "platform": { - "php": "7.3.0" + "php": "8.1.0" }, "optimize-autoloader": true, "sort-packages": true }, "require": { - "php": ">=7.3" + "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^9.3", + "phpunit/phpunit": "^10.0", "symfony/process": "^4.2 || ^5" }, "autoload": { @@ -41,7 +41,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "5.0-dev" } } } diff --git a/php-sebastian-diff5.spec b/php-sebastian-diff5.spec index 47de816..e38f8be 100644 --- a/php-sebastian-diff5.spec +++ b/php-sebastian-diff5.spec @@ -1,15 +1,16 @@ -# remirepo/fedora spec file for php-sebastian-diff4 +# remirepo/fedora spec file for php-sebastian-diff5 # -# Copyright (c) 2013-2020 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2013-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%bcond_without tests +# disabled until phpunit10 available +%bcond_with tests -%global gh_commit 3461e3fccc7cfdfc2720be910d3bd73c69be590d +%global gh_commit 70dd1b20bc198da394ad542e988381b44e64e39f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project diff @@ -20,11 +21,11 @@ %global ns_vendor SebastianBergmann %global ns_project Diff -%global major 4 +%global major 5 %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 4.0.4 +Version: 5.0.0 Release: 1%{?dist} Summary: Diff implementation, version %{major} @@ -36,20 +37,20 @@ Source1: makesrc.sh BuildArch: noarch BuildRequires: php-fedora-autoloader-devel %if %{with tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 8.1 BuildRequires: php-pcre BuildRequires: php-spl # from composer.json, "require-dev": { -# "phpunit/phpunit": "^9.3", +# "phpunit/phpunit": "^10.0", # "symfony/process": "^4.2 || ^5" -BuildRequires: phpunit9 >= 9.3 +BuildRequires: phpunit10 BuildRequires: php-symfony4-process %endif # from composer.json -# "php": ">=7.3" -Requires: php(language) >= 7.3 -# from phpcompatinfo report for version 4.0.0 +# "php": ">=8.1" +Requires: php(language) >= 8.1 +# from phpcompatinfo report for version 5.0.0 Requires: php-pcre Requires: php-spl # Autoloader @@ -100,10 +101,10 @@ rm tests/Utils/UnifiedDiffAssertTraitIntegrationTest.php : Run upstream test suite ret=0 -for cmd in php php73 php74 php80; do +for cmd in php php81 php82; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit9 --verbose || ret=1 + %{_bindir}/phpunit10 --verbose || ret=1 fi done exit $ret @@ -123,6 +124,12 @@ exit $ret %changelog +* Fri Feb 3 2023 Remi Collet - 5.0.0-1 +- update to 5.0.0 +- raise dependency on PHP 8.1 +- rename to php-sebastian-diff5 +- move to /usr/share/php/SebastianBergmann/Diff5 + * Mon Oct 26 2020 Remi Collet - 4.0.4-1 - update to 4.0.4 -- cgit