diff --git a/.gitignore b/.gitignore index db86992..75159f9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /php-justinrainbow-json-schema5-5.2.7-8560d43.tgz /php-justinrainbow-json-schema5-5.2.8-dcb6e10.tgz /php-justinrainbow-json-schema5-5.2.9-44c6787.tgz +/php-justinrainbow-json-schema5-5.2.10-2ba9c8c.tgz diff --git a/php-justinrainbow-json-schema5-makesrc.sh b/php-justinrainbow-json-schema5-makesrc.sh index e9f0fbc..dfd5c2a 100755 --- a/php-justinrainbow-json-schema5-makesrc.sh +++ b/php-justinrainbow-json-schema5-makesrc.sh @@ -3,9 +3,7 @@ NAME=$(basename $PWD) OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) -MAJOR=$(sed -n '/^%global major/{s/.* //;p}' $NAME.spec) -MINOR=$(sed -n '/^%global minor/{s/.* //;p}' $NAME.spec) -VERSION=$MAJOR.$MINOR +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} diff --git a/php-justinrainbow-json-schema5.spec b/php-justinrainbow-json-schema5.spec index ee1e26c..aa56a1a 100644 --- a/php-justinrainbow-json-schema5.spec +++ b/php-justinrainbow-json-schema5.spec @@ -6,14 +6,13 @@ # # Please, preserve the changelog entries # -%global gh_commit 44c6787311242a979fa15c704327c20e7221a0e4 +%global gh_commit 2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b %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.9 # Some sample files, only used for tests @@ -28,7 +27,7 @@ %global eolv2 0 Name: php-%{gh_owner}-%{gh_project}%{major} -Version: %{major}.%{minor} +Version: 5.2.10 Release: 1%{?dist} Summary: A library to validate a json schema License: MIT @@ -55,7 +54,7 @@ BuildRequires: php-mbstring BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "json-schema/JSON-Schema-Test-Suite": "1.2.0", +# "json-schema/json-schema-test-suite": "1.2.0", # "friendsofphp/php-cs-fixer": "^2.1", # "phpunit/phpunit": "^4.8.35" BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35 @@ -157,7 +156,7 @@ php bin/validate-json-test \ : Upstream test suite ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php72 php73 php74 php80; do if which $cmd; then $cmd -d memory_limit=1G %{_bindir}/phpunit -d memory_limit=1G --verbose || ret=1 fi @@ -178,6 +177,9 @@ exit $ret %changelog +* Thu May 28 2020 Remi Collet - 5.2.10-1 +- update to 5.2.10 + * Thu Sep 26 2019 Remi Collet - 5.2.9-1 - update to 5.2.9 diff --git a/sources b/sources index 665fa92..aeff673 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.9-44c6787.tgz) = 652a90380517ab1ee1b79b3930947e8a6b3485cf87838574e4d0fda71a4a1485a0bfbe24f815a833aa227665baa37334094ab408f6b89c5f015c6c6f9853d018 +SHA512 (php-justinrainbow-json-schema5-5.2.10-2ba9c8c.tgz) = 1c1e274c2cd1110fe2f18b765293fe540024d15cf130873250049b8538a55a9d31b9eedea70b1697d4e461df248781beed6f4cd0d46e0ec039fa30e104d0849c