From 0c052b830d5f128f14b2a2c5e1794461f1f2b02e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 28 Sep 2023 16:06:09 +0200
Subject: [PATCH] update to 5.2.13

disable test suite

(cherry picked from commit 4750ffe172e8de88fedf0d046f65662287ce1eea)
(cherry picked from commit 01117a874d5c70fc22cb8609b6a509abebbce138)
---
 .gitignore                          |  1 +
 php-justinrainbow-json-schema5.spec | 30 +++++++++++++++++++----------
 sources                             |  2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab4fa6f..dbe3c32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ clog
 /php-justinrainbow-json-schema5-5.2.10-2ba9c8c.tgz
 /php-justinrainbow-json-schema5-5.2.11-2ab6744.tgz
 /php-justinrainbow-json-schema5-5.2.12-ad87d5a.tgz
+/php-justinrainbow-json-schema5-5.2.13-fbbe7e5.tgz
diff --git a/php-justinrainbow-json-schema5.spec b/php-justinrainbow-json-schema5.spec
index 6bf7c48..e0004e7 100644
--- a/php-justinrainbow-json-schema5.spec
+++ b/php-justinrainbow-json-schema5.spec
@@ -1,17 +1,24 @@
 # remirepo/fedora spec file for php-justinrainbow-json-schema5
 #
-# Copyright (c) 2016-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2016-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    ad87d5a5ca981228e0e205c2bc7dfb8e24559b60
+
+%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10
+# disable test suite until recent phpunit is supported
+%bcond_with          tests
+%else
+%bcond_without       tests
+%endif
+
+%global gh_commit    fbbe7e5d79f618997bc3332a6f49246036c45793
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     justinrainbow
 %global gh_project   json-schema
 %global php_home     %{_datadir}/php
-%global with_tests   0%{!?_without_tests:1}
 %global major        5
 
 
@@ -27,8 +34,8 @@
 %global eolv2        0
 
 Name:           php-%{gh_owner}-%{gh_project}%{major}
-Version:        5.2.12
-Release:        3%{?dist}
+Version:        5.2.13
+Release:        1%{?dist}
 Summary:        A library to validate a json schema
 License:        MIT
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -43,7 +50,7 @@ Source3:        %{name}-makesrc.sh
 Patch0:         %{name}-rpm.patch
 
 BuildArch:      noarch
-%if %{with_tests}
+%if %{with tests}
 # For tests
 BuildRequires:  php(language) >= 5.3.3
 BuildRequires:  php-curl
@@ -101,7 +108,7 @@ Autoloader: %{php_home}/JsonSchema%{major}/autoload.php
 %prep
 %setup -q -n %{gh_project}-%{gh_commit} -a 1
 
-%patch0 -p1 -b .rpm
+%patch -P0 -p1 -b .rpm
 find src -name \*.rpm -delete -print
 
 cp %{SOURCE2} src/JsonSchema/autoload.php
@@ -137,7 +144,7 @@ install -Dpm 0755 bin/validate-json %{buildroot}%{_bindir}/validate-json%{major}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 : Test suite autoloader
 cat << 'EOF' | tee vendor/autoload.php
 <?php
@@ -156,7 +163,7 @@ php bin/validate-json-test \
 
 : Upstream test suite
 ret=0
-for cmd in php php74 php80 php81; do
+for cmd in php php80 php81 php82 php83; do
   if which $cmd; then
    $cmd -d memory_limit=1G %{_bindir}/phpunit -d memory_limit=1G --verbose || ret=1
   fi
@@ -177,6 +184,9 @@ exit $ret
 
 
 %changelog
+* Thu Sep 28 2023 Remi Collet <remi@remirepo.net> - 5.2.13-1
+- update to 5.2.13
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index aa1328a..c1e7636 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (JSON-Schema-Test-Suite-1.2.0-f3d5aeb.tar.gz) = 6b917a0a0b02d5b2be6457403fba0ae4d3789634da911ebbdc56986b99ae285ed8a7bc696abc668f2a95b55e33d7bfbf8709162fc0995d76ab2f0d05494a2d02
-SHA512 (php-justinrainbow-json-schema5-5.2.12-ad87d5a.tgz) = aa8c61308796e686ae2c2a4b51e39d304ac1011c8060fc64eb4bec8f7772216d991efcd0fb0d8387358e8988765d5faa534e278d0757cc001c7e0c622b127995
+SHA512 (php-justinrainbow-json-schema5-5.2.13-fbbe7e5.tgz) = 7eea47c5de0b4b0206d0fdfce51da6beb0bcb2d767e127d029261b7866eed6c132a198183e84664b5547e623c5dce73685616441c5f1aec56b80519a268ad2bc