From 342ce9dc155e1a287f7e0a6545518f420f927636 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 3 Oct 2017 14:46:15 +0200 Subject: [PATCH 1/5] v5.2.2 (cherry picked from commit aaaae074d6e1bd83ae0b5beb0f7ba47588341dd4) --- .gitignore | 1 + php-justinrainbow-json-schema5.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3a3d11b..220ede3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /php-justinrainbow-json-schema5-5.1.0-48817e5.tgz /php-justinrainbow-json-schema5-5.2.0-e3c9bcc.tgz /php-justinrainbow-json-schema5-5.2.1-429be23.tgz +/php-justinrainbow-json-schema5-5.2.2-b80053b.tgz diff --git a/php-justinrainbow-json-schema5.spec b/php-justinrainbow-json-schema5.spec index aa4758f..71df90f 100644 --- a/php-justinrainbow-json-schema5.spec +++ b/php-justinrainbow-json-schema5.spec @@ -6,14 +6,14 @@ # # Please, preserve the changelog entries # -%global gh_commit 429be236f296ca249d61c65649cdf2652f4a5e80 +%global gh_commit b80053b620826810b38211b3c5f935ba9cddf6b3 %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 -%global minor 2.1 +%global minor 2.2 # Some sample files, only used for tests @@ -57,9 +57,8 @@ BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { # "json-schema/JSON-Schema-Test-Suite": "1.2.0", -# "phpunit/phpunit": "^4.8.22", # "friendsofphp/php-cs-fixer": "^2.1", -# "phpdocumentor/phpdocumentor": "^2.7" +# "phpunit/phpunit": "^4.8.22" BuildRequires: php-composer(phpunit/phpunit) >= 4.8.22 # Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -181,6 +180,9 @@ exit $ret %changelog +* Tue Oct 3 2017 Remi Collet - 5.2.2-1 +- Update to 5.2.2 + * Wed May 17 2017 Remi Collet - 5.2.1-1 - Update to 5.2.1 diff --git a/sources b/sources index 45c837a..282ce73 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.1-429be23.tgz) = c8b22be2ba601d4e9e2ec94470841f5cadc5a0a73bceb8bfeb5d7a16ed5fe8da0e3769e5843a16a38512bfbcfc99aece55003945e48f1bcfebd63e5b6e35f733 +SHA512 (php-justinrainbow-json-schema5-5.2.2-b80053b.tgz) = 2dfa72e0c6195e53ca6a473e6d3867ac33b229df0897f14c63e4094b48445c6fc82eb4c271d2b195bab0ac22a1e04e7a811a2199fb9a6e654926f741403c7b13 From 85c194b517175ef5f1a34505a879193a0028ae42 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Oct 2017 08:50:52 +0200 Subject: [PATCH 2/5] v5.2.4 (cherry picked from commit 3c368e183f89d6c61478445202bc49bc9bfe11e0) --- .gitignore | 1 + php-justinrainbow-json-schema5.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 220ede3..7b8607b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /php-justinrainbow-json-schema5-5.2.0-e3c9bcc.tgz /php-justinrainbow-json-schema5-5.2.1-429be23.tgz /php-justinrainbow-json-schema5-5.2.2-b80053b.tgz +/php-justinrainbow-json-schema5-5.2.4-7ccb0e6.tgz diff --git a/php-justinrainbow-json-schema5.spec b/php-justinrainbow-json-schema5.spec index 71df90f..33342f2 100644 --- a/php-justinrainbow-json-schema5.spec +++ b/php-justinrainbow-json-schema5.spec @@ -6,14 +6,14 @@ # # Please, preserve the changelog entries # -%global gh_commit b80053b620826810b38211b3c5f935ba9cddf6b3 +%global gh_commit 7ccb0e67ea8ace0f84c40900ca3c8a234467628c %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 -%global minor 2.2 +%global minor 2.4 # Some sample files, only used for tests @@ -180,6 +180,9 @@ exit $ret %changelog +* Thu Oct 5 2017 Remi Collet - 5.2.4-1 +- Update to 5.2.4 + * Tue Oct 3 2017 Remi Collet - 5.2.2-1 - Update to 5.2.2 diff --git a/sources b/sources index 282ce73..031320f 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.2-b80053b.tgz) = 2dfa72e0c6195e53ca6a473e6d3867ac33b229df0897f14c63e4094b48445c6fc82eb4c271d2b195bab0ac22a1e04e7a811a2199fb9a6e654926f741403c7b13 +SHA512 (php-justinrainbow-json-schema5-5.2.4-7ccb0e6.tgz) = 3d1a5969b4371a7ed49174bb6f740c60bff47c9436cc6a5023dc52b08aa25f150a1d58e58713d912c640e50b8189366295468289734bd78d8497a39c8347e885 From c4d56d4b53a928186f90f266a1e19889b6c1dab0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Oct 2017 13:11:13 +0200 Subject: [PATCH 3/5] v5.2.5 (cherry picked from commit 304f352727bffc16f6a73d4c3ca406ffc08c1e74) (cherry picked from commit 5eaf378d85e4270834cff5c5ab0440f53d03018e) --- .gitignore | 1 + php-justinrainbow-json-schema5.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7b8607b..6b5f013 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /php-justinrainbow-json-schema5-5.2.1-429be23.tgz /php-justinrainbow-json-schema5-5.2.2-b80053b.tgz /php-justinrainbow-json-schema5-5.2.4-7ccb0e6.tgz +/php-justinrainbow-json-schema5-5.2.5-0d4fda8.tgz diff --git a/php-justinrainbow-json-schema5.spec b/php-justinrainbow-json-schema5.spec index 33342f2..db117fb 100644 --- a/php-justinrainbow-json-schema5.spec +++ b/php-justinrainbow-json-schema5.spec @@ -6,14 +6,14 @@ # # Please, preserve the changelog entries # -%global gh_commit 7ccb0e67ea8ace0f84c40900ca3c8a234467628c +%global gh_commit 0d4fda8efdf216ade084a7f0aad5637572ce9835 %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 -%global minor 2.4 +%global minor 2.5 # Some sample files, only used for tests @@ -180,6 +180,9 @@ exit $ret %changelog +* Wed Oct 11 2017 Remi Collet - 5.2.5-1 +- Update to 5.2.5 + * Thu Oct 5 2017 Remi Collet - 5.2.4-1 - Update to 5.2.4 diff --git a/sources b/sources index 031320f..86bf42a 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.4-7ccb0e6.tgz) = 3d1a5969b4371a7ed49174bb6f740c60bff47c9436cc6a5023dc52b08aa25f150a1d58e58713d912c640e50b8189366295468289734bd78d8497a39c8347e885 +SHA512 (php-justinrainbow-json-schema5-5.2.5-0d4fda8.tgz) = 6d3d963e2098d55b2e4bd88ed558edce25c77a7bce0af1aae4c2151243f4256d4ae45705a9b6fde602042865c8c057c333f9ee5c063f77fa2e358c5047739303 From 1d94babe5aada0917ca5c9da5f09963b669a7d3e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Oct 2017 06:39:22 +0200 Subject: [PATCH 4/5] v5.2.6 (cherry picked from commit cd3542419888046ea443dbf9254d4ed238af3f37) --- .gitignore | 1 + php-justinrainbow-json-schema5.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6b5f013..d7fe4b0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /php-justinrainbow-json-schema5-5.2.2-b80053b.tgz /php-justinrainbow-json-schema5-5.2.4-7ccb0e6.tgz /php-justinrainbow-json-schema5-5.2.5-0d4fda8.tgz +/php-justinrainbow-json-schema5-5.2.6-d283e11.tgz diff --git a/php-justinrainbow-json-schema5.spec b/php-justinrainbow-json-schema5.spec index db117fb..15cbf8b 100644 --- a/php-justinrainbow-json-schema5.spec +++ b/php-justinrainbow-json-schema5.spec @@ -6,14 +6,14 @@ # # Please, preserve the changelog entries # -%global gh_commit 0d4fda8efdf216ade084a7f0aad5637572ce9835 +%global gh_commit d283e11b6e14c6f4664cf080415c4341293e5bbd %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 -%global minor 2.5 +%global minor 2.6 # Some sample files, only used for tests @@ -180,6 +180,9 @@ exit $ret %changelog +* Sun Oct 22 2017 Remi Collet - 5.2.6-1 +- Update to 5.2.6 + * Wed Oct 11 2017 Remi Collet - 5.2.5-1 - Update to 5.2.5 diff --git a/sources b/sources index 86bf42a..b085969 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.5-0d4fda8.tgz) = 6d3d963e2098d55b2e4bd88ed558edce25c77a7bce0af1aae4c2151243f4256d4ae45705a9b6fde602042865c8c057c333f9ee5c063f77fa2e358c5047739303 +SHA512 (php-justinrainbow-json-schema5-5.2.6-d283e11.tgz) = aec7344c3fb346e55be5aa48c4e22cc53e9b405395c8cca07ce1632cecd39b7fa8ca53583c005d0054e845ef9effa6846682fd60dce5f89b73aaa3202925b322 From 2dd81eb7119ff922eb36b3ee9ced06c0e8fcee95 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Feb 2018 08:05:45 +0100 Subject: [PATCH 5/5] v5.2.7 (cherry picked from commit adba0cf9aa26ffc9ea21f6e6c0708cf7a81231fb) (cherry picked from commit fe48b3b9ab4cdb78aad5dd42ff5628d60064bd4c) --- .gitignore | 1 + php-justinrainbow-json-schema5.spec | 18 ++++++++++-------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index d7fe4b0..30b4298 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /php-justinrainbow-json-schema5-5.2.4-7ccb0e6.tgz /php-justinrainbow-json-schema5-5.2.5-0d4fda8.tgz /php-justinrainbow-json-schema5-5.2.6-d283e11.tgz +/php-justinrainbow-json-schema5-5.2.7-8560d43.tgz diff --git a/php-justinrainbow-json-schema5.spec b/php-justinrainbow-json-schema5.spec index 15cbf8b..ccb7f7b 100644 --- a/php-justinrainbow-json-schema5.spec +++ b/php-justinrainbow-json-schema5.spec @@ -1,19 +1,19 @@ # remirepo/fedora spec file for php-justinrainbow-json-schema5 # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit d283e11b6e14c6f4664cf080415c4341293e5bbd +%global gh_commit 8560d4314577199ba51bf2032f02cd1315587c23 %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 -%global minor 2.6 +%global minor 2.7 # Some sample files, only used for tests @@ -31,10 +31,9 @@ Name: php-%{gh_owner}-%{gh_project}%{major} Version: %{major}.%{minor} Release: 1%{?dist} Summary: A library to validate a json schema - -Group: Development/Libraries License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} + # git snapshot to get upstream test suite Source0: %{name}-%{version}-%{gh_short}.tgz Source1: https://github.com/%{ts_owner}/%{ts_project}/archive/%{ts_commit}/%{ts_project}-%{ts_version}-%{ts_short}.tar.gz @@ -58,8 +57,8 @@ BuildRequires: php-spl # From composer.json, "require-dev": { # "json-schema/JSON-Schema-Test-Suite": "1.2.0", # "friendsofphp/php-cs-fixer": "^2.1", -# "phpunit/phpunit": "^4.8.22" -BuildRequires: php-composer(phpunit/phpunit) >= 4.8.22 +# "phpunit/phpunit": "^4.8.35" +BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35 # Autoloader BuildRequires: php-composer(fedora/autoloader) # For composer schema @@ -158,7 +157,7 @@ php bin/validate-json-test \ : Upstream test suite ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then $cmd -d memory_limit=1G %{_bindir}/phpunit -d memory_limit=1G --verbose || ret=1 fi @@ -180,6 +179,9 @@ exit $ret %changelog +* Thu Feb 15 2018 Remi Collet - 5.2.7-1 +- Update to 5.2.7 + * Sun Oct 22 2017 Remi Collet - 5.2.6-1 - Update to 5.2.6 diff --git a/sources b/sources index b085969..fdea8af 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.6-d283e11.tgz) = aec7344c3fb346e55be5aa48c4e22cc53e9b405395c8cca07ce1632cecd39b7fa8ca53583c005d0054e845ef9effa6846682fd60dce5f89b73aaa3202925b322 +SHA512 (php-justinrainbow-json-schema5-5.2.7-8560d43.tgz) = e43d8cfc09aabaec3532e8ca788c6362072d27d626f9150a6d7f68750d58a748b4dff45edd5f89c1f9e6a5edb0d6365af76f253d07c8c3ea13e4e9323505b179