From 5b4b7cf825ac8d7fbbe3389ccb62c1bf892f7a4c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Feb 2023 13:52:17 +0100 Subject: update to 5.0.0 raise dependency on PHP 8.1 raise dependency on sebastian/diff 5 raise dependency on sebastian/exporter 5 rename to php-sebastian-comparator5 move to /usr/share/php/SebastianBergmann/Comparator5 add dependency on mbstring extension --- composer.json | 14 ++++---- php-sebastian-comparator5.spec | 80 +++++++++++++++++++++++++----------------- 2 files changed, 55 insertions(+), 39 deletions(-) diff --git a/composer.json b/composer.json index b758e03..03c8aed 100644 --- a/composer.json +++ b/composer.json @@ -24,16 +24,18 @@ ], "prefer-stable": true, "require": { - "php": ">=7.3", - "sebastian/diff": "^4.0", - "sebastian/exporter": "^4.0" + "php": ">=8.1", + "sebastian/diff": "^5.0", + "sebastian/exporter": "^5.0", + "ext-dom": "*", + "ext-mbstring": "*" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^10.0" }, "config": { "platform": { - "php": "7.3.0" + "php": "8.1.0" }, "optimize-autoloader": true, "sort-packages": true @@ -50,7 +52,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "5.0-dev" } } } diff --git a/php-sebastian-comparator5.spec b/php-sebastian-comparator5.spec index b9aaf36..3c59dec 100644 --- a/php-sebastian-comparator5.spec +++ b/php-sebastian-comparator5.spec @@ -1,13 +1,16 @@ -# remirepo/fedora spec file for php-sebastian-comparator4 +# remirepo/fedora spec file for php-sebastian-comparator5 # -# Copyright (c) 2014-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2014-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global bootstrap 0 -%global gh_commit fa0f136dd2334583309d32b62544682ee972b51a + +# disabled until phpunit10 available +%bcond_with tests + +%global gh_commit 72f01e6586e0caf6af81297897bd112eb7e9627c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project comparator @@ -15,18 +18,13 @@ %global pk_vendor sebastian %global pk_project %{gh_project} # Namespace -%global major 4 +%global major 5 %global php_home %{_datadir}/php %global ns_vendor SebastianBergmann %global ns_project Comparator -%if %{bootstrap} -%bcond_with tests -%else -%bcond_without tests -%endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 4.0.8 +Version: 5.0.0 Release: 1%{?dist} Summary: Compare PHP values for equality, version %{major} @@ -37,40 +35,47 @@ Source1: makesrc.sh BuildArch: noarch -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 8.1 +BuildRequires: php-date +BuildRequires: php-dom +BuildRequires: php-mbstring +BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(%{pk_vendor}/diff) >= 4.0 with php-composer(%{pk_vendor}/diff) < 5) -BuildRequires: (php-composer(%{pk_vendor}/exporter) >= 4.0 with php-composer(%{pk_vendor}/exporter) < 5) +BuildRequires: (php-composer(%{pk_vendor}/diff) >= 5.0 with php-composer(%{pk_vendor}/diff) < 6) +BuildRequires: (php-composer(%{pk_vendor}/exporter) >= 5.0 with php-composer(%{pk_vendor}/exporter) < 6) # remirepo:4 %else -BuildRequires: php-sebastian-diff4 -BuildRequires: php-sebastian-exporter4 +BuildRequires: php-sebastian-diff5 +BuildRequires: php-sebastian-exporter5 %endif BuildRequires: php-fedora-autoloader-devel %if %{with tests} # from composer.json, "require-dev": { -# "phpunit/phpunit": "^9.3" -BuildRequires: phpunit9 >= 9.3 +# "phpunit/phpunit": "^10.0" +BuildRequires: phpunit10 %endif # from composer.json -# "php": ">=7.3", -# "sebastian/diff": "^4.0", -# "sebastian/exporter": "^4.0" -Requires: php(language) >= 7.3 +# "php": ">=8.1", +# "sebastian/diff": "^5.0", +# "sebastian/exporter": "^5.0" +# "ext-dom": "*", +# "ext-mbstring": "*" +Requires: php(language) >= 8.1 +Requires: php-dom +Requires: php-mbstring # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(%{pk_vendor}/diff) >= 4.0 with php-composer(%{pk_vendor}/diff) < 5) -Requires: (php-composer(%{pk_vendor}/exporter) >= 4.0 with php-composer(%{pk_vendor}/exporter) < 5) +Requires: (php-composer(%{pk_vendor}/diff) >= 5.0 with php-composer(%{pk_vendor}/diff) < 6) +Requires: (php-composer(%{pk_vendor}/exporter) >= 5.0 with php-composer(%{pk_vendor}/exporter) < 6) # remirepo:4 %else -Requires: php-sebastian-diff4 -Requires: php-sebastian-exporter4 +Requires: php-sebastian-diff5 +Requires: php-sebastian-exporter5 %endif -# from phpcompatinfo report for version 4.0.0 +# from phpcompatinfo report for version 5.0.0 Requires: php-date -Requires: php-dom Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -96,8 +101,8 @@ phpab --template fedora --output src/autoload.php src cat < - 5.0.0-1 +- update to 5.0.0 +- raise dependency on PHP 8.1 +- raise dependency on sebastian/diff 5 +- raise dependency on sebastian/exporter 5 +- rename to php-sebastian-comparator5 +- move to /usr/share/php/SebastianBergmann/Comparator5 +- add dependency on mbstring extension + * Wed Sep 14 2022 Remi Collet - 4.0.8-1 - update to 4.0.8 -- cgit