diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-justinrainbow-json-schema5.spec | 37 |
2 files changed, 13 insertions, 26 deletions
diff --git a/composer.json b/composer.json index f1f6fae..3e26b0f 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "json-schema/JSON-Schema-Test-Suite": "1.2.0", "phpunit/phpunit": "^4.8.22", "friendsofphp/php-cs-fixer": "^2.1", - "phpdocumentor/phpdocumentor": "~2" + "phpdocumentor/phpdocumentor": "^2.7" }, "autoload": { "psr-4": { "JsonSchema\\": "src/JsonSchema/" } diff --git a/php-justinrainbow-json-schema5.spec b/php-justinrainbow-json-schema5.spec index 2bcf0cc..aa4758f 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 e3c9bccdc38bbd09bcac0131c00f3be58368b416 +%global gh_commit 429be236f296ca249d61c65649cdf2652f4a5e80 %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.0 +%global minor 2.1 # Some sample files, only used for tests @@ -44,7 +44,6 @@ Source3: %{name}-makesrc.sh # Autoloader Patch0: %{name}-rpm.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if %{with_tests} # For tests @@ -60,7 +59,7 @@ BuildRequires: php-spl # "json-schema/JSON-Schema-Test-Suite": "1.2.0", # "phpunit/phpunit": "^4.8.22", # "friendsofphp/php-cs-fixer": "^2.1", -# "phpdocumentor/phpdocumentor": "~2" +# "phpdocumentor/phpdocumentor": "^2.7" BuildRequires: php-composer(phpunit/phpunit) >= 4.8.22 # Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -128,11 +127,10 @@ find vendor/json-schema/JSON-Schema-Test-Suite/tests \ %install -rm -rf %{buildroot} - : Library mkdir -p %{buildroot}%{php_home} cp -pr src/JsonSchema %{buildroot}%{php_home}/JsonSchema%{major} + : Schemas mkdir -p %{buildroot}%{_datadir}/%{name} cp -pr dist %{buildroot}%{_datadir}/%{name}/dist @@ -160,33 +158,19 @@ php bin/validate-json-test \ /usr/share/composer/res/composer-schema.json : Upstream test suite -# remirepo:11 -run=0 ret=0 -if which php56; then - php56 -d memory_limit=1G %{_bindir}/phpunit || ret=1 - run=1 -fi -if which php71; then - php71 -d memory_limit=1G %{_bindir}/phpunit || ret=1 - run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/phpunit -d memory_limit=1G --verbose -# remirepo:2 -fi +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd -d memory_limit=1G %{_bindir}/phpunit -d memory_limit=1G --verbose || ret=1 + fi +done exit $ret %else : Test suite disabled %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json @@ -197,6 +181,9 @@ rm -rf %{buildroot} %changelog +* Wed May 17 2017 Remi Collet <remi@remirepo.net> - 5.2.1-1 +- Update to 5.2.1 + * Thu Mar 23 2017 Remi Collet <remi@remirepo.net> - 5.2.0-1 - Update to 5.2.0 |