From 325f60f0d4ef4261e0a68602e97a21e73adf3a8b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 25 Sep 2020 08:13:21 +0200
Subject: [PATCH 1/2] v3.8.0

(cherry picked from commit bc5c11e5210bfc31dfc3bb68e3870a50bfab0dcf)
---
 .gitignore                  |  1 +
 php-swaggest-json-diff.spec | 14 +++++++++-----
 sources                     |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index efec102..aabb38e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /php-swaggest-json-diff-3.7.2-fb13f6f.tgz
 /php-swaggest-json-diff-3.7.4-fccbbd6.tgz
 /php-swaggest-json-diff-3.7.5-e452a9c.tgz
+/php-swaggest-json-diff-3.8.0-3210781.tgz
diff --git a/php-swaggest-json-diff.spec b/php-swaggest-json-diff.spec
index 1cef471..c242540 100644
--- a/php-swaggest-json-diff.spec
+++ b/php-swaggest-json-diff.spec
@@ -7,9 +7,10 @@
 # Please, preserve the changelog entries
 #
 
-%global with_tests   0%{!?_without_tests:1}
+%bcond_without       tests
+
 # Github
-%global gh_commit    e452a9c6444905a486280c7d56503a6468303f69
+%global gh_commit    321078163129c2292ac5be38369730b107cd3716
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     swaggest
 %global gh_project   json-diff
@@ -22,7 +23,7 @@
 %global major        %nil
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.7.5
+Version:        3.8.0
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        JSON diff/rearrange/patch/pointer library for PHP
 
@@ -32,7 +33,7 @@ Source0:        %{name}-%{version}-%{?gh_short}.tgz
 Source1:        makesrc.sh
 
 BuildArch:      noarch
-%if %{with_tests}
+%if %{with tests}
 BuildRequires:  php-json
 # For tests, from composer.json "require-dev": {
 #    "phpunit/phpunit": "^4.8.23"
@@ -79,7 +80,7 @@ cp -pr src    %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
@@ -109,6 +110,9 @@ exit $ret
 
 
 %changelog
+* Fri Sep 25 2020 Remi Collet <remi@remirepo.net> - 3.8.0-1
+- update to 3.8.0
+
 * Wed May 27 2020 Remi Collet <remi@remirepo.net> - 3.7.5-1
 - update to 3.7.5
 
diff --git a/sources b/sources
index a93d017..5fd4fe9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-swaggest-json-diff-3.7.5-e452a9c.tgz) = 97daecbb123a6fc0898ef5f68e4c7c88c11177bb34c38a5be608c5cf9ae743ea8d66ec60a2c842594adc41547ada8e56dd30a2f12a265e798fa64f0f791725e3
+SHA512 (php-swaggest-json-diff-3.8.0-3210781.tgz) = 297a9b2003c977e47f4d5f61174c87fb03eeb8f6a08b5b78c6ad0ceae46a9317b7bbb783a80417702cd51b0229fdd24e49fb6bda71195b82b552dc426884b455

From 1297dd5374d3a36afc9185f67863be5c04a7c3d5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 28 Sep 2020 08:28:46 +0200
Subject: [PATCH 2/2] v3.8.1

(cherry picked from commit bb271dec33c359afe4e9646ba04cb9b38f00d835)
---
 .gitignore                  | 1 +
 php-swaggest-json-diff.spec | 7 +++++--
 sources                     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index aabb38e..cc173d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /php-swaggest-json-diff-3.7.4-fccbbd6.tgz
 /php-swaggest-json-diff-3.7.5-e452a9c.tgz
 /php-swaggest-json-diff-3.8.0-3210781.tgz
+/php-swaggest-json-diff-3.8.1-d218435.tgz
diff --git a/php-swaggest-json-diff.spec b/php-swaggest-json-diff.spec
index c242540..6bb2b65 100644
--- a/php-swaggest-json-diff.spec
+++ b/php-swaggest-json-diff.spec
@@ -10,7 +10,7 @@
 %bcond_without       tests
 
 # Github
-%global gh_commit    321078163129c2292ac5be38369730b107cd3716
+%global gh_commit    d2184358c5ef5ecaa1f6b4c2bce175fac2d25670
 %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.8.0
+Version:        3.8.1
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        JSON diff/rearrange/patch/pointer library for PHP
 
@@ -110,6 +110,9 @@ exit $ret
 
 
 %changelog
+* Mon Sep 28 2020 Remi Collet <remi@remirepo.net> - 3.8.1-1
+- update to 3.8.1
+
 * Fri Sep 25 2020 Remi Collet <remi@remirepo.net> - 3.8.0-1
 - update to 3.8.0
 
diff --git a/sources b/sources
index 5fd4fe9..3d5fdae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-swaggest-json-diff-3.8.0-3210781.tgz) = 297a9b2003c977e47f4d5f61174c87fb03eeb8f6a08b5b78c6ad0ceae46a9317b7bbb783a80417702cd51b0229fdd24e49fb6bda71195b82b552dc426884b455
+SHA512 (php-swaggest-json-diff-3.8.1-d218435.tgz) = 1dcec32191c23d44808a51c8e1c1e1e571274d587dfe0e242b96dae5b2b8e6add0c4bd50ed0ee80ee68fadb516bc68b3a7d0671288e97e52d759be817e8bf7ac