From 16194eb227f8652574bfa59834a436ccbf3e50eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:54:07 +0000 Subject: [PATCH 1/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-swaggest-json-diff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-swaggest-json-diff.spec b/php-swaggest-json-diff.spec index 14541bc..59bf018 100644 --- a/php-swaggest-json-diff.spec +++ b/php-swaggest-json-diff.spec @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 3.11.0 -Release: 2%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} +Release: 3%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: JSON diff/rearrange/patch/pointer library for PHP License: MIT @@ -117,6 +117,9 @@ exit $ret %changelog +* 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 From 418eaf73bd83ed8288e455dbc4c0d74ab1a21bb5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Mar 2025 08:40:19 +0100 Subject: [PATCH 2/4] update to 3.12.0 re-license spec file to CECILL-2.1 --- .gitignore | 1 + php-swaggest-json-diff.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c744914..2360a07 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /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 diff --git a/php-swaggest-json-diff.spec b/php-swaggest-json-diff.spec index 59bf018..8049b99 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 # -# Copyright (c) 2019-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2019-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit c55d38a3cb372753b5d5ee4c9b7d8470e486e6a5 +%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.11.0 -Release: 3%{?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 @@ -96,7 +96,7 @@ class PHPUnit_Framework_TestCase extends \PHPUnit\Framework\Testcase { EOF ret=0 -for cmd in php php81 php82 php83; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then $cmd %{phpunit} --no-coverage || ret=1 fi @@ -117,6 +117,10 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 3ef8374..c3a6e3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-diff-3.11.0-c55d38a.tgz) = 21c061f2e66031bea85e7ca1125f2b5af30d213a25a9387a967554e39e80fa88ea87af51d5908a101634dccf7a43447260565d8603ede46300c60c0635a068ef +SHA512 (php-swaggest-json-diff-3.12.0-d17d237.tgz) = cf011ff908cfc17eb3db28defa5a4a3674df44af8d44befe4cdec4d6ee9996e225b28164581ec8a3bc828a2f0f78f86063f583d5e666f255f7be4e433c66c83b From 108af103aba05b0658d613eecb938c43be11c062 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Mar 2025 10:18:14 +0100 Subject: [PATCH 3/4] v3.12.1 --- .gitignore | 1 + php-swaggest-json-diff.spec | 19 +++++++++++-------- sources | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 2360a07..46d3283 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /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 8049b99..9fb92ed 100644 --- a/php-swaggest-json-diff.spec +++ b/php-swaggest-json-diff.spec @@ -10,7 +10,7 @@ %bcond_without tests # Github -%global gh_commit d17d237f9159d312b4827a4e9f18984b31317c51 +%global gh_commit 7ebc4eab95bcc73916433964c266588d09b35052 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swaggest %global gh_project json-diff @@ -23,7 +23,7 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.12.0 +Version: 3.12.1 Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: JSON diff/rearrange/patch/pointer library for PHP @@ -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": "*" +# "ext-json": "*", +# "php": ">=7.1" +Requires: php(language) >= 7.1 Requires: php-json -# From phpcompatinfo report for 3.7.0 -Requires: php-filter -Requires: php-pcre +# From phpcompatinfo report for 3.12.1 +# only filter, json and pcre # For generated autoloader Requires: php-composer(fedora/autoloader) @@ -117,6 +117,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index c3a6e3c..23f3aec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-diff-3.12.0-d17d237.tgz) = cf011ff908cfc17eb3db28defa5a4a3674df44af8d44befe4cdec4d6ee9996e225b28164581ec8a3bc828a2f0f78f86063f583d5e666f255f7be4e433c66c83b +SHA512 (php-swaggest-json-diff-3.12.1-7ebc4ea.tgz) = ae848bb3683898dddee0212cbf74bafdaf4558913ba8be97ccff5773e5de98e4102bedeb4bfc479b9c6b94ba9d4df99ffa2f9ff7fd13fb7fd773fc30887a2c94 From dc68b5bdd0545b6b782a6668e06fea022dc0b551 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:39:05 +0000 Subject: [PATCH 4/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-swaggest-json-diff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-swaggest-json-diff.spec b/php-swaggest-json-diff.spec index 9fb92ed..1a9f32f 100644 --- a/php-swaggest-json-diff.spec +++ b/php-swaggest-json-diff.spec @@ -24,7 +24,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 3.12.1 -Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} +Release: 2%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: JSON diff/rearrange/patch/pointer library for PHP License: MIT @@ -117,6 +117,9 @@ 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