From 454235fde313783f1584aa3eec15d030dd02634a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 5 Jan 2022 14:11:49 +0100 Subject: update to 2.11.0 raise dependency on PHP 7.4 raise dependency on laminas-servicemanager 3.10.0 raise dependency on laminas-stdlib 3.6.0 raise dependency on laminas-validator 2.15.1 --- composer.json | 18 ++++++---------- php-laminas-barcode.spec | 56 +++++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 38 deletions(-) diff --git a/composer.json b/composer.json index a2f58dc..fe0de85 100644 --- a/composer.json +++ b/composer.json @@ -19,19 +19,15 @@ "sort-packages": true }, "require": { - "php": "^7.3 || ~8.0.0", - "laminas/laminas-servicemanager": "^3.6.0", - "laminas/laminas-stdlib": "^2.7.7 || ^3.1", - "laminas/laminas-validator": "^2.10.1" + "php": "~7.4.0 || ~8.0.0 || ~8.1.0", + "laminas/laminas-servicemanager": "^3.10.0", + "laminas/laminas-stdlib": "^3.6.0", + "laminas/laminas-validator": "^2.15.1" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "laminas/laminas-config": "^2.6 || ^3.1", - "phpunit/phpunit": "^9.5.2", - "zendframework/zendpdf": "^2.0.2" - }, - "suggest": { - "zendframework/zendpdf": "ZendPdf component" + "laminas/laminas-coding-standard": "~2.3.0", + "laminas/laminas-config": "^3.7.0", + "phpunit/phpunit": "^9.3.7" }, "autoload": { "psr-4": { diff --git a/php-laminas-barcode.spec b/php-laminas-barcode.spec index cb3b2db..13fc6d3 100644 --- a/php-laminas-barcode.spec +++ b/php-laminas-barcode.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-laminas-barcode # -# Copyright (c) 2015-2021 Remi Collet +# Copyright (c) 2015-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 0e853bec9165f2b99b7e956673bbf3b1f393177b +%global gh_commit e2a4b56e2f6c800992fe1c7e7cc0da851dcfdfa0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-barcode @@ -22,7 +22,7 @@ %endif Name: php-%{gh_project} -Version: 2.10.0 +Version: 2.11.0 Release: 1%{?dist} Summary: %{namespace} Framework %{library} component @@ -34,7 +34,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 7.4 BuildRequires: php-dom BuildRequires: php-gd @@ -43,41 +43,40 @@ BuildRequires: php-pcre BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.6.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.10.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3) BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { -# "laminas/laminas-coding-standard": "~1.0.0", -# "laminas/laminas-config": "^2.6 || ^3.1", -# "phpunit/phpunit": "^9.5.2", -# "zendframework/zendpdf": "^2.0.2" -BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 2.6 with php-autoloader(%{gh_owner}/laminas-config) < 4) +# "laminas/laminas-coding-standard": "~2.3.0", +# "laminas/laminas-config": "^3.7.0", +# "phpunit/phpunit": "^9.3.7" +BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 3.7 with php-autoloader(%{gh_owner}/laminas-config) < 4) # remirepo:7 %else BuildRequires: php-laminas-servicemanager BuildRequires: php-laminas-stdlib BuildRequires: php-laminas-validator BuildRequires: php-laminas-zendframework-bridge -BuildRequires: php-laminas-config +BuildRequires: php-laminas-config3 %endif %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.5.2 +BuildRequires: phpunit9 >= 9.3.7 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0", -# "laminas/laminas-servicemanager": "^3.6.0", -# "laminas/laminas-stdlib": "^2.7.7 || ^3.1", -# "laminas/laminas-validator": "^2.10.1" -Requires: php(language) >= 7.3 +# "php": "~7.4.0 || ~8.0.0 || ~8.1.0", +# "laminas/laminas-servicemanager": "^3.10.0", +# "laminas/laminas-stdlib": "^3.6.0", +# "laminas/laminas-validator": "^2.15.1" +Requires: php(language) >= 7.4 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.6.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.10.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3) Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # remirepo:6 %else @@ -160,10 +159,7 @@ cat << 'EOF' | tee vendor/autoload.php - 2.11.0-1 +- update to 2.11.0 +- raise dependency on PHP 7.4 +- raise dependency on laminas-servicemanager 3.10.0 +- raise dependency on laminas-stdlib 3.6.0 +- raise dependency on laminas-validator 2.15.1 + * Mon Dec 20 2021 Remi Collet - 2.10.0-1 - update to 2.10.0 (no change) - keep compatibility using laminas-zendframework-bridge -- cgit