diff --git a/.gitignore b/.gitignore index d660691..38e860f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ /php-swaggest-json-schema-0.12.24-395a9f6.tgz /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 diff --git a/php-swaggest-json-schema.spec b/php-swaggest-json-schema.spec index 1d68843..421f69b 100644 --- a/php-swaggest-json-schema.spec +++ b/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 6f57c0d80e246c2868accaab5c550cd470a5537f +%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.28 +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 - 0.12.31-1 +- update to 0.12.31 + +* Thu Sep 10 2020 Remi Collet - 0.12.30-1 +- update to 0.12.30 + +* Thu Mar 19 2020 Remi Collet - 0.12.29-1 +- update to 0.12.29 + * Mon Jan 27 2020 Remi Collet - 0.12.28-1 - update to 0.12.28 diff --git a/sources b/sources index 6a12d8d..2909ecb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-schema-0.12.28-6f57c0d.tgz) = 24ef1b9cf3aec751ac26bcf87e3e32d501bf99f0eb35d294ceb4a94c0ad90badd4b803dc131b8cbc73e022caab78e5fdac4ecf79aa4c871e6f67d04457ee1fbb +SHA512 (php-swaggest-json-schema-0.12.31-a4adcdb.tgz) = 298b8b9fa111b6bad535f03bdd7206b300d94b7c4550141c9713acfd077da28cc74e2afeef2b342caa0b55d0e02d6ce82b91f91eae5a4001d61cfab722b41594