From d30731e71db4a5c70c103f76d0164f8a4cde58c3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Oct 2019 11:21:40 +0200 Subject: - update to 2.8.0 (no change) - raise dependency on zend-stdlib 3.2.1 --- composer.json | 6 +++--- php-zendframework-zend-xmlrpc.spec | 24 ++++++++++++++---------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 65f3815..f2343a9 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "zendframework/zend-http": "^2.5.4", "zendframework/zend-math": "^2.7 || ^3.0", "zendframework/zend-server": "^2.7", - "zendframework/zend-stdlib": "^2.7 || ^3.0", + "zendframework/zend-stdlib": "^3.2.1", "zendframework/zendxml": "^1.0.2" }, "require-dev": { @@ -49,8 +49,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" + "dev-master": "2.8.x-dev", + "dev-develop": "2.9.x-dev" } }, "scripts": { diff --git a/php-zendframework-zend-xmlrpc.spec b/php-zendframework-zend-xmlrpc.spec index 19973b8..3e2f4fe 100644 --- a/php-zendframework-zend-xmlrpc.spec +++ b/php-zendframework-zend-xmlrpc.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 97e7d70d71b040c8fc94807a911ee9a53dc35ef5 +%global gh_commit 49b3bbd0c5ab01eb740892c2435e07b2e2b6d5f3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-xmlrpc @@ -20,11 +20,10 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.7.0 -Release: 2%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: Zend Framework %{library} component -Group: Development/Libraries License: BSD URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz @@ -50,7 +49,7 @@ BuildRequires: php-xmlwriter BuildRequires: (php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 with php-autoloader(%{gh_owner}/zend-http) < 3) BuildRequires: (php-autoloader(%{gh_owner}/zend-math) >= 2.7 with php-autoloader(%{gh_owner}/zend-math) < 4) BuildRequires: (php-autoloader(%{gh_owner}/zend-server) >= 2.7 with php-autoloader(%{gh_owner}/zend-server) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) BuildRequires: (php-autoloader(%{gh_owner}/zendxml) >= 1.0.2 with php-autoloader(%{gh_owner}/zendxml) < 2) %global phpunit %{_bindir}/phpunit7 BuildRequires: phpunit7 >= 7.1.2 @@ -63,7 +62,7 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-math) >= 2.7 BuildRequires: php-autoloader(%{gh_owner}/zend-server) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-server) >= 2.7 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 BuildRequires: php-autoloader(%{gh_owner}/zendxml) < 2 BuildRequires: php-autoloader(%{gh_owner}/zendxml) >= 1.0.2 %global phpunit %{_bindir}/phpunit6 @@ -78,7 +77,7 @@ BuildRequires: php-fedora-autoloader-devel # "zendframework/zend-http": "^2.5.4", # "zendframework/zend-math": "^2.7 || ^3.0", # "zendframework/zend-server": "^2.7", -# "zendframework/zend-stdlib": "^2.7 || ^3.0", +# "zendframework/zend-stdlib": "^3.2.1", # "zendframework/zendxml": "^1.0.2" Requires: php(language) >= 5.6 %if ! %{bootstrap} @@ -87,7 +86,7 @@ Requires: php(language) >= 5.6 Requires: (php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 with php-autoloader(%{gh_owner}/zend-http) < 3) Requires: (php-autoloader(%{gh_owner}/zend-math) >= 2.7 with php-autoloader(%{gh_owner}/zend-math) < 4) Requires: (php-autoloader(%{gh_owner}/zend-server) >= 2.7 with php-autoloader(%{gh_owner}/zend-server) < 3) -Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) Requires: (php-autoloader(%{gh_owner}/zendxml) >= 1.0.2 with php-autoloader(%{gh_owner}/zendxml) < 2) # remirepo:12 %else @@ -98,7 +97,7 @@ Requires: php-autoloader(%{gh_owner}/zend-math) >= 2.7 Requires: php-autoloader(%{gh_owner}/zend-server) < 3 Requires: php-autoloader(%{gh_owner}/zend-server) >= 2.7 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 Requires: php-autoloader(%{gh_owner}/zendxml) < 2 Requires: php-autoloader(%{gh_owner}/zendxml) >= 1.0.2 %endif @@ -176,7 +175,7 @@ require_once 'test/TestAsset/functions.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" php71 php72; do +for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 @@ -189,6 +188,7 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -197,6 +197,10 @@ exit $ret %changelog +* Mon Oct 21 2019 Remi Collet - 2.8.0-1 +- update to 2.8.0 (no change) +- raise dependency on zend-stdlib 3.2.1 + * Tue May 15 2018 Remi Collet - 2.7.0-1 - update to 2.7.0 - use range dependencies on F27+ -- cgit