diff options
| -rw-r--r-- | php-JsonSchema-php-lt-5-4-0-compat.patch | 23 | ||||
| -rw-r--r-- | php-JsonSchema.spec | 29 |
2 files changed, 12 insertions, 40 deletions
diff --git a/php-JsonSchema-php-lt-5-4-0-compat.patch b/php-JsonSchema-php-lt-5-4-0-compat.patch deleted file mode 100644 index a63c44e..0000000 --- a/php-JsonSchema-php-lt-5-4-0-compat.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3973764636b93f1b94ea6842bdf2e780b2a59822 Mon Sep 17 00:00:00 2001 -From: Shawn Iwinski <siwinski@redhat.com> -Date: Fri, 29 Aug 2014 22:41:25 -0400 -Subject: [PATCH] PHP < 5.4.0 compatibility for "--dump-schema" - ---- - bin/validate-json | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bin/validate-json b/bin/validate-json -index 2f2fe44..8831a6e 100755 ---- a/bin/validate-json -+++ b/bin/validate-json -@@ -218,7 +218,8 @@ $refResolver = new JsonSchema\RefResolver($retriever); - $refResolver->resolve($schema, $urlSchema); - - if (isset($arOptions['--dump-schema'])) { -- echo json_encode($schema, JSON_PRETTY_PRINT) . "\n"; -+ $options = version_compare(PHP_VERSION, '5.4.0', '>=') ? JSON_PRETTY_PRINT : 0; -+ echo json_encode($schema, $options) . "\n"; - exit(); - } - diff --git a/php-JsonSchema.spec b/php-JsonSchema.spec index b8534fe..af5a607 100644 --- a/php-JsonSchema.spec +++ b/php-JsonSchema.spec @@ -1,5 +1,6 @@ +# remirepo spec file for php-JsonSchema, from: # -# RPM spec file for php-JsonSchema +# Fedora spec file for php-JsonSchema # # Copyright (c) 2012-2015 Shawn Iwinski <shawn.iwinski@gmail.com> # @@ -11,11 +12,10 @@ %global github_owner justinrainbow %global github_name json-schema -%global github_version 1.4.1 -%global github_commit 2465fe486c864e30badaa4d005ebdf89dbc503f3 +%global github_version 1.4.2 +%global github_commit 7dfe4f1db8a62be3dd35710efce663537d515653 %global github_short %(c=%{github_commit}; echo ${c:0:7}) -# See https://github.com/justinrainbow/json-schema/pull/96 %global php_min_ver 5.3.2 %global lib_name JsonSchema @@ -33,10 +33,6 @@ License: BSD URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_short}.tar.gz -# PHP < 5.4.0 compatibility for "--dump-schema" -# https://github.com/justinrainbow/json-schema/pull/109 -Patch0: %{name}-php-lt-5-4-0-compat.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if %{with_tests} @@ -54,8 +50,9 @@ BuildRequires: php-spl %endif Requires: php(language) >= %{php_min_ver} -# phpcompatinfo (computed from v1.4.0) +# phpcompatinfo (computed from v1.4.2) Requires: php-curl +Requires: php-date Requires: php-filter Requires: php-json Requires: php-mbstring @@ -74,12 +71,6 @@ See http://json-schema.org for more details. %prep %setup -qn %{github_name}-%{github_commit} -%patch0 -p1 - -# Update bin shebang -sed 's#/usr/bin/env php#%{_bindir}/php#' \ - -i bin/validate-json - %build # Empty build section, nothing to build @@ -102,7 +93,7 @@ cat > autoload.php <<'AUTOLOAD' <?php spl_autoload_register(function ($class) { $src = str_replace('\\', '/', $class).'.php'; - require_once $src; + @include $src; }); AUTOLOAD @@ -111,7 +102,8 @@ rm -rf tests/JsonSchema/Tests/Drafts %{_bindir}/phpunit \ --include-path="./src:./tests" \ - --bootstrap="./autoload.php" + --bootstrap="./autoload.php" \ + --verbose %else : Tests skipped %endif @@ -127,6 +119,9 @@ rm -rf tests/JsonSchema/Tests/Drafts %changelog +* Mon Jun 15 2015 Remi Collet <remi@fedoraproject.org> - 1.4.2-1 +- update to 1.4.2 + * Fri Mar 27 2015 Remi Collet <remi@fedoraproject.org> - 1.4.1-1 - Update to 1.4.1 |