From 376db8c29df871283defacb805afabe2caac8c1f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sep 10 2021 12:01:36 +0000 Subject: update to 2.15.0 keep compatibility using laminas-zendframework-bridge as this is only used using compat autolader raise dependency on zend-loader >= 2.8 raise dependency on zend-stdlib >= 3.6 raise dependency on zend-uri >= 2.9.1 raise dependency on zend-validator >= 2.15 --- diff --git a/.gitignore b/.gitignore index 31ff953..29aaea9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-laminas-http-2.13.0-33b7942.tgz /php-laminas-http-2.14.2-298f732.tgz /php-laminas-http-2.14.3-bfaab80.tgz +/php-laminas-http-2.15.0-e1f3420.tgz diff --git a/php-laminas-http.spec b/php-laminas-http.spec index 9ac1ff4..4f04c1c 100644 --- a/php-laminas-http.spec +++ b/php-laminas-http.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit bfaab8093e382274efed7fdc3ceb15f09ba352bb +%global gh_commit e1f3420ab35e21ea135913d213b8d570e5e7b513 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-http @@ -22,8 +22,8 @@ %endif Name: php-%{gh_project} -Version: 2.14.3 -Release: 2%{?dist} +Version: 2.15.0 +Release: 1%{?dist} Summary: %{namespace} Framework %{library} component License: BSD @@ -43,10 +43,10 @@ BuildRequires: php-openssl BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-zlib -BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5.1 with php-autoloader(%{gh_owner}/laminas-loader) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5.2 with php-autoloader(%{gh_owner}/laminas-uri) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.8 with php-autoloader(%{gh_owner}/laminas-loader) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-uri) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15 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", @@ -60,18 +60,17 @@ BuildRequires: phpunit9 >= 9.3 BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ^8.0", -# "laminas/laminas-loader": "^2.5.1", -# "laminas/laminas-stdlib": "^3.2.1", -# "laminas/laminas-uri": "^2.5.2", -# "laminas/laminas-validator": "^2.10.1", -# "laminas/laminas-zendframework-bridge": "^1.0" +# "php": "^7.3 || ~8.0.0 || ~8.1.0", +# "laminas/laminas-loader": "^2.8", +# "laminas/laminas-stdlib": "^3.6", +# "laminas/laminas-uri": "^2.9.1", +# "laminas/laminas-validator": "^2.15" Requires: php(language) >= 7.3 %if ! %{bootstrap} -Requires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.5.1 with php-autoloader(%{gh_owner}/laminas-loader) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) -Requires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5.2 with php-autoloader(%{gh_owner}/laminas-uri) < 3) -Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-loader) >= 2.8 with php-autoloader(%{gh_owner}/laminas-loader) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-uri) < 3) +Requires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15 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) %endif # Autoloader @@ -165,7 +164,7 @@ exit (class_exists("\\Zend\\%{library}\\Client") ? 0 : 1); : upstream test suite # testStreamCompression: online test ret=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} \ @@ -188,6 +187,15 @@ exit $ret %changelog +* Fri Sep 10 2021 Remi Collet - 2.15.0-1 +- update to 2.15.0 +- keep compatibility using laminas-zendframework-bridge + as this is only used using compat autolader +- raise dependency on zend-loader >= 2.8 +- raise dependency on zend-stdlib >= 3.6 +- raise dependency on zend-uri >= 2.9.1 +- raise dependency on zend-validator >= 2.15 + * Fri Jul 23 2021 Fedora Release Engineering - 2.14.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 48fc452..e7b97f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-laminas-http-2.14.3-bfaab80.tgz) = d00e0c1eec33ddcfa17b7fe957ea4362ea946d1fbef8d39deca9c2dcad5bde3107a71d306f47688e91e6af9862b3892c10acafc341fbaf7222492f5e52470535 +SHA512 (php-laminas-http-2.15.0-e1f3420.tgz) = 34b1cfbd9c7f5f9f12d337716a741edbcb85cd586706be474e12b55cfae90910d153781d5856ddb0980ca12193e1549e45d53c8106e5d8c74d27167ed1cf37d3