diff --git a/.gitignore b/.gitignore index 46d3283..980ca25 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,3 @@ /php-swaggest-json-diff-3.10.1-b9da3c5.tgz /php-swaggest-json-diff-3.10.3-02df617.tgz /php-swaggest-json-diff-3.10.4-f4e5117.tgz -/php-swaggest-json-diff-3.10.5-17bfc66.tgz -/php-swaggest-json-diff-3.11.0-c55d38a.tgz -/php-swaggest-json-diff-3.12.0-d17d237.tgz -/php-swaggest-json-diff-3.12.1-7ebc4ea.tgz diff --git a/php-swaggest-json-diff.spec b/php-swaggest-json-diff.spec index 1a9f32f..389e92e 100644 --- a/php-swaggest-json-diff.spec +++ b/php-swaggest-json-diff.spec @@ -1,8 +1,8 @@ # remirepo/fedora spec file for php-swaggest-json-diff # -# SPDX-FileCopyrightText: Copyright 2019-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2019-2022 Remi Collet +# License: CC-BY-SA +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 7ebc4eab95bcc73916433964c266588d09b35052 +%global gh_commit f4e511708060ff7511a3743fab4aa484a062bcfb %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swaggest %global gh_project json-diff @@ -23,8 +23,8 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.12.1 -Release: 2%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} +Version: 3.10.4 +Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: JSON diff/rearrange/patch/pointer library for PHP License: MIT @@ -34,23 +34,23 @@ Source1: makesrc.sh BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 7.1 BuildRequires: php-json # For tests, from composer.json "require-dev": { # "phpunit/phpunit": "4.8.37" -BuildRequires: phpunit9 -%global phpunit %{_bindir}/phpunit9 +BuildRequires: php-composer(phpunit/phpunit) >= 4.8.37 +%global phpunit %{_bindir}/phpunit +BuildRequires: php-filter +BuildRequires: php-pcre # For autoloader BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require": { -# "ext-json": "*", -# "php": ">=7.1" -Requires: php(language) >= 7.1 +# "ext-json": "*" Requires: php-json -# From phpcompatinfo report for 3.12.1 -# only filter, json and pcre +# From phpcompatinfo report for 3.7.0 +Requires: php-filter +Requires: php-pcre # For generated autoloader Requires: php-composer(fedora/autoloader) @@ -86,19 +86,12 @@ cat << 'EOF' | tee vendor/autoload.php expectException($e); - $this->expectExceptionMessage($m); - } -} EOF ret=0 -for cmd in php php81 php82 php83 php84; do +for cmd in php php74 php80 php81 php82; do if which $cmd; then - $cmd %{phpunit} --no-coverage || ret=1 + $cmd %{phpunit} --no-coverage --verbose || ret=1 fi done exit $ret @@ -117,43 +110,6 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 3.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Mar 10 2025 Remi Collet - 3.12.1-1 -- update to 3.12.1 - -* Tue Mar 4 2025 Remi Collet - 3.12.0-1 -- update to 3.12.0 -- re-license spec file to CECILL-2.1 - -* Sat Jan 18 2025 Fedora Release Engineering - 3.11.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 3.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jul 3 2024 Remi Collet - 3.11.0-1 -- update to 3.11.0 - -* Thu Jan 25 2024 Fedora Release Engineering - 3.10.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 3.10.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Nov 17 2023 Remi Collet - 3.10.5-1 -- update to 3.10.5 - -* Fri Oct 6 2023 Remi Collet - 3.10.4-4 -- switch to phpunit9 - -* Fri Jul 21 2023 Fedora Release Engineering - 3.10.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 3.10.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Thu Nov 10 2022 Remi Collet - 3.10.4-1 - update to 3.10.4 diff --git a/sources b/sources index 23f3aec..6c9d1df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-diff-3.12.1-7ebc4ea.tgz) = ae848bb3683898dddee0212cbf74bafdaf4558913ba8be97ccff5773e5de98e4102bedeb4bfc479b9c6b94ba9d4df99ffa2f9ff7fd13fb7fd773fc30887a2c94 +SHA512 (php-swaggest-json-diff-3.10.4-f4e5117.tgz) = f576474415cd151ee78d4931755d978d971b7c30ed6ebf0652f8ad0cb7ff1666d1fc562a2ee7cf8d373941bb8ad35e0b1593693dddd0a09f8a351c46944da569