From 23753fac82aab18e22a225371ddddaf04ccad02d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Nov 2021 14:35:44 +0100 Subject: update to 2.14.2 --- composer.json | 1 + php-laminas-view.spec | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 46c247b..b3f3813 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ }, "require": { "php": "^7.3 || ~8.0.0 || ~8.1.0", + "ext-json": "*", "laminas/laminas-eventmanager": "^3.4", "laminas/laminas-json": "^2.6.1 || ^3.3", "laminas/laminas-stdlib": "^3.6" diff --git a/php-laminas-view.spec b/php-laminas-view.spec index 7465389..eea3f08 100644 --- a/php-laminas-view.spec +++ b/php-laminas-view.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 164756dbec742379194381d40306cfd28f96028a +%global gh_commit ced4133462b917c62d1efc26f982a62b5e319b4b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-view @@ -18,7 +18,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_project} -Version: 2.14.1 +Version: 2.14.2 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -132,11 +132,13 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^7.3 || ~8.0.0 || ~8.1.0", +# "ext-json": "*", # "laminas/laminas-eventmanager": "^3.4", # "laminas/laminas-json": "^2.6.1 || ^3.3", # "laminas/laminas-loader": "^2.5", # "laminas/laminas-stdlib": "^3.6" Requires: php(language) >= 7.3 +Requires: php-json # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.4 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4) @@ -304,10 +306,9 @@ rm -r test/Helper* : upstream test suite ret=0 -for cmd in php php73 php74 php80 php81; do +for cmd in php php74 php80 php81; do if which $cmd; then $cmd %{_bindir}/phpunit9 \ - --filter '^((?!(testSetAttribsIsDeprecated|testGetAttribsIsDeprecated)).)*$' \ --verbose || ret=1 fi done @@ -329,6 +330,9 @@ exit $ret %changelog +* Wed Nov 17 2021 Remi Collet - 2.14.2-1 +- update to 2.14.2 + * Thu Oct 14 2021 Remi Collet - 2.14.1-1 - update to 2.14.1 -- cgit