diff --git a/.gitignore b/.gitignore index 46d3283..2360a07 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,3 @@ /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..67e91b3 100644 --- a/php-swaggest-json-diff.spec +++ b/php-swaggest-json-diff.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit 7ebc4eab95bcc73916433964c266588d09b35052 +%global gh_commit d17d237f9159d312b4827a4e9f18984b31317c51 %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.12.0 +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-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) @@ -117,22 +117,10 @@ 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 diff --git a/sources b/sources index 23f3aec..c3a6e3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-diff-3.12.1-7ebc4ea.tgz) = ae848bb3683898dddee0212cbf74bafdaf4558913ba8be97ccff5773e5de98e4102bedeb4bfc479b9c6b94ba9d4df99ffa2f9ff7fd13fb7fd773fc30887a2c94 +SHA512 (php-swaggest-json-diff-3.12.0-d17d237.tgz) = cf011ff908cfc17eb3db28defa5a4a3674df44af8d44befe4cdec4d6ee9996e225b28164581ec8a3bc828a2f0f78f86063f583d5e666f255f7be4e433c66c83b