remi pushed to php-JsonSchema (f22). "v 1.4.2"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Jun 15 09:06:04 UTC 2015
From 3f77bb2db11ba06316372e0b62f2be683808941a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Mon, 15 Jun 2015 10:56:28 +0200
Subject: v 1.4.2
diff --git a/.gitignore b/.gitignore
index a2b60c9..e82cde1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/php-JsonSchema-1.3.7-87b54b460febed69726c781ab67462084e97a105.tar.gz
/php-JsonSchema-1.4.0-680d026.tar.gz
/php-JsonSchema-1.4.1-2465fe4.tar.gz
+/php-JsonSchema-1.4.2-7dfe4f1.tar.gz
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 at 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 f4a1995..66bd0dc 100644
--- a/php-JsonSchema.spec
+++ b/php-JsonSchema.spec
@@ -1,5 +1,5 @@
#
-# RPM spec file for php-JsonSchema
+# Fedora spec file for php-JsonSchema
#
# Copyright (c) 2012-2015 Shawn Iwinski <shawn.iwinski at gmail.com>
#
@@ -11,11 +11,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
@@ -25,7 +24,7 @@
Name: php-%{lib_name}
Version: %{github_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: PHP implementation of JSON schema
Group: Development/Libraries
@@ -33,16 +32,12 @@ 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
-
BuildArch: noarch
%if %{with_tests}
# For tests
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-phpunit-PHPUnit
-# For tests: phpcompatinfo (computed from v1.4.0)
+# For tests: phpcompatinfo (computed from v1.4.2)
BuildRequires: php-curl
BuildRequires: php-date
BuildRequires: php-filter
@@ -53,8 +48,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
@@ -73,8 +69,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
@@ -112,7 +106,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 +122,9 @@ rm -rf tests/JsonSchema/Tests/Drafts
%changelog
+* Mon Jun 15 2015 Remi Collet <remi at fedoraproject.org> - 1.4.2-1
+- update to 1.4.2
+
* Mon Apr 13 2015 Remi Collet <remi at fedoraproject.org> - 1.4.2-1
- fix tests autoloader (FTBFS detected by Koschei)
diff --git a/sources b/sources
index a54c5d7..465ac8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f6503e89bc3fa6c878a93d253b72db6 php-JsonSchema-1.4.1-2465fe4.tar.gz
+9230db3fa2282f0a7c85f17b6402eb0f php-JsonSchema-1.4.2-7dfe4f1.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/php-JsonSchema.git/commit/?h=f22&id=3f77bb2db11ba06316372e0b62f2be683808941a
More information about the scm-commits
mailing list