v0.12.31

(cherry picked from commit 5e0f7efde1)

.gitignore

@@ -6,3 +6,5 @@
 /php-swaggest-json-schema-0.12.25-0f50979.tgz
 /php-swaggest-json-schema-0.12.28-6f57c0d.tgz
 /php-swaggest-json-schema-0.12.29-7564d4a.tgz
+/php-swaggest-json-schema-0.12.30-4aca4f5.tgz
+/php-swaggest-json-schema-0.12.31-a4adcdb.tgz

php-swaggest-json-schema.spec

@@ -7,9 +7,10 @@
 # Please, preserve the changelog entries
 #
 
-%global with_tests   0%{!?_without_tests:1}
+%bcond_without       tests
+
 # Github
-%global gh_commit    7564d4a5fc8c068479698a30e5a7c589ea32a9c6
+%global gh_commit    a4adcdbb38f38a19d3f1801150822172cf1c4853
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     swaggest
 %global gh_project   php-json-schema
@@ -22,7 +23,7 @@
 %global major        %nil
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        0.12.29
+Version:        0.12.31
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        High definition PHP structures with JSON-schema based validation
 
@@ -32,18 +33,16 @@ Source0:        %{name}-%{version}-%{?gh_short}.tgz
 Source1:        makesrc.sh
 
 BuildArch:      noarch
-%if %{with_tests}
+%if %{with tests}
 BuildRequires:  php(language) >= 5.4
 BuildRequires:  php-json
 BuildRequires:  php-mbstring
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(phplang/scope-exit)    >  1.0   with php-composer(phplang/scope-exit)    < 2)
-BuildRequires: (php-composer(swaggest/json-diff)    >  3.5.1 with php-composer(swaggest/json-diff)    < 4)
+BuildRequires: (php-composer(phplang/scope-exit)    >= 1.0   with php-composer(phplang/scope-exit)    < 2)
+BuildRequires: (php-composer(swaggest/json-diff)    >= 3.5.1 with php-composer(swaggest/json-diff)    < 4)
 %else
-BuildRequires:  php-composer(phplang/scope-exit)    <  2
-BuildRequires:  php-composer(phplang/scope-exit)    >= 1.0
-BuildRequires:  php-composer(swaggest/json-diff)    <  4
-BuildRequires:  php-composer(swaggest/json-diff)    >= 3.5.1
+BuildRequires:  php-phplang-scope-exit              >= 1.0
+BuildRequires:  php-swaggest-json-diff              >= 3.5.1
 %endif
 # For tests, from composer.json "require-dev": {
 #    "phpunit/phpunit": "^4.8.23",
@@ -69,13 +68,11 @@ Requires:       php(language) >= 5.4
 Requires:       php-json
 Requires:       php-mbstring
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(phplang/scope-exit)    >  1.0   with php-composer(phplang/scope-exit)    < 2)
-Requires:      (php-composer(swaggest/json-diff)    >  3.5.1 with php-composer(swaggest/json-diff)    < 4)
+Requires:      (php-composer(phplang/scope-exit)    >= 1.0   with php-composer(phplang/scope-exit)    < 2)
+Requires:      (php-composer(swaggest/json-diff)    >= 3.5.1 with php-composer(swaggest/json-diff)    < 4)
 %else
-Requires:       php-composer(phplang/scope-exit)    <  2
-Requires:       php-composer(phplang/scope-exit)    >= 1.0
-Requires:       php-composer(swaggest/json-diff)    <  4
-Requires:       php-composer(swaggest/json-diff)    >= 3.5.1
+Requires:       php-phplang-scope-exit              >= 1.0
+Requires:       php-swaggest-json-diff              >= 3.5.1
 %endif
 # From phpcompatinfo report for 0.12.17
 Requires:       php-date
@@ -123,7 +120,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
@@ -152,6 +149,12 @@ exit $ret
 
 
 %changelog
+* Mon Sep 21 2020 Remi Collet <remi@remirepo.net> - 0.12.31-1
+- update to 0.12.31
+
+* Thu Sep 10 2020 Remi Collet <remi@remirepo.net> - 0.12.30-1
+- update to 0.12.30
+
 * Thu Mar 19 2020 Remi Collet <remi@remirepo.net> - 0.12.29-1
 - update to 0.12.29
 

sources

@@ -1 +1 @@
-SHA512 (php-swaggest-json-schema-0.12.29-7564d4a.tgz) = ad757232c7ec8be7bd6cd488a77c3fac70a6140e6fc0e915cee4393265c22eae6c8d72ad067e8af6a1181aa049caa5c1d1e9b1359abc739e7a3680357d48d566
+SHA512 (php-swaggest-json-schema-0.12.31-a4adcdb.tgz) = 298b8b9fa111b6bad535f03bdd7206b300d94b7c4550141c9713acfd077da28cc74e2afeef2b342caa0b55d0e02d6ce82b91f91eae5a4001d61cfab722b41594