From 1c0e6ec155f21d701300d429d2279833ddd27110 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Sep 2021 09:50:07 +0200 Subject: update to 2.8.0 drop dependency on laminas-zendframework-bridge --- php-laminas-diactoros2.spec | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'php-laminas-diactoros2.spec') diff --git a/php-laminas-diactoros2.spec b/php-laminas-diactoros2.spec index e54b18c..fe8b62b 100644 --- a/php-laminas-diactoros2.spec +++ b/php-laminas-diactoros2.spec @@ -10,7 +10,7 @@ %global gh_owner laminas %global gh_project laminas-diactoros -%global gh_commit 7d2034110ae18afe05050b796a3ee4b3fe177876 +%global gh_commit 0c26ef1d95b6d7e6e3943a243ba3dc0797227199 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global php_home %{_datadir}/php %global namespace Laminas @@ -36,7 +36,7 @@ %{!?phpdir: %global phpdir %{_datadir}/php} Name: php-%{gh_project}%{major} -Version: 2.6.0 +Version: 2.8.0 Release: 1%{?gh_release}%{?dist} Summary: PSR HTTP Message implementations v%{major} @@ -61,13 +61,11 @@ BuildArch: noarch BuildRequires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) BuildRequires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2) BuildRequires: (php-composer(psr/http-factory) >= 1.0 with php-composer(psr/http-factory) < 2) BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3) -# remirepo:6 +# remirepo:5 %else -BuildRequires: php-laminas-zendframework-bridge BuildRequires: php-psr-http-message BuildRequires: php-psr-http-factory BuildRequires: php-phpspec-prophecy-phpunit @@ -103,19 +101,16 @@ BuildRequires: php-fedora-autoloader-devel # composer.json # "require": { -# "php": "^7.3 || ~8.0.0", -# "laminas/laminas-zendframework-bridge": "^1.0", +# "php": "^7.3 || ~8.0.0 || ~8.1.0", # "psr/http-factory": "^1.0", # "psr/http-message": "^1.0" Requires: php(language) >= 7.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) Requires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2) Requires: (php-composer(psr/http-factory) >= 1.0 with php-composer(psr/http-factory) < 2) # remirepo:5 %else -Requires: php-laminas-zendframework-bridge Requires: php-psr-http-message Requires: php-psr-http-factory %endif @@ -202,7 +197,7 @@ sed -e 's:vendor/http-interop/http-factory-tests:factory:' \ : Upstream tests # Skip tests requiring network access RETURN_CODE=0 -for CMDARG in "php %{phpunit}" php73 php74 php80; do +for CMDARG in "php %{phpunit}" php73 php74 php80 php81; do if which $CMDARG; then set $CMDARG $1 ${2:-%{_bindir}/phpunit9} \ @@ -228,6 +223,10 @@ exit $RETURN_CODE %changelog +* Fri Sep 24 2021 Remi Collet - 2.8.0-1 +- update to 2.8.0 +- drop dependency on laminas-zendframework-bridge + * Wed May 19 2021 Remi Collet - 2.6.0-1 - update to 2.6.0 -- cgit