From 9932ac73bff016994570f2f501f0fde7cabda3dd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 4 Mar 2025 08:40:19 +0100
Subject: [PATCH] update to 3.12.0

re-license spec file to CECILL-2.1

(cherry picked from commit 418eaf73bd83ed8288e455dbc4c0d74ab1a21bb5)
---
 .gitignore                  |  1 +
 php-swaggest-json-diff.spec | 16 ++++++++++------
 sources                     |  2 +-
 3 files changed, 12 insertions(+), 7 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 e7b895f..67e91b3 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,7 +23,7 @@
 %global major        %nil
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.11.0
+Version:        3.12.0
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        JSON diff/rearrange/patch/pointer library for PHP
 
@@ -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 <remi@remirepo.net> - 3.12.0-1
+- update to 3.12.0
+- re-license spec file to CECILL-2.1
+
 * Wed Jul  3 2024 Remi Collet <remi@remirepo.net> - 3.11.0-1
 - update to 3.11.0
 
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