diff options
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | php-zendframework-zend-feed.spec | 31 |
2 files changed, 23 insertions, 16 deletions
diff --git a/composer.json b/composer.json index c01748e..08b64f8 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,10 @@ }, "require": { "php": "^5.6 || ^7.0", + "ext-dom": "*", + "ext-libxml": "*", "zendframework/zend-escaper": "^2.5.2", - "zendframework/zend-stdlib": "^2.7.7 || ^3.1" + "zendframework/zend-stdlib": "^3.2.1" }, "require-dev": { "phpunit/phpunit": "^5.7.23 || ^6.4.3", @@ -53,8 +55,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.10.x-dev", - "dev-develop": "2.11.x-dev" + "dev-master": "2.11.x-dev", + "dev-develop": "2.12.x-dev" } }, "scripts": { diff --git a/php-zendframework-zend-feed.spec b/php-zendframework-zend-feed.spec index 370f70c..93d9473 100644 --- a/php-zendframework-zend-feed.spec +++ b/php-zendframework-zend-feed.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-feed # -# Copyright (c) 2015-2018 Remi Collet +# Copyright (c) 2015-2019 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 6641f4cf3f4586c63f83fd70b6d19966025c8888 +%global gh_commit 5248e9fffa760e5c36092aeff02c3797e4a8a690 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-feed @@ -20,11 +20,10 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.10.3 -Release: 2%{?dist} +Version: 2.11.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 @@ -56,7 +55,7 @@ BuildRequires: phpunit6 >= 6.4.3 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-autoloader(%{gh_owner}/zend-escaper) >= 2.5.2 with php-autoloader(%{gh_owner}/zend-escaper) < 3) -BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.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-composer(psr/http-message) >= 1.0.1 with php-composer(psr/http-message) < 2) BuildRequires: (php-autoloader(%{gh_owner}/zend-cache) >= 2.7.2 with php-autoloader(%{gh_owner}/zend-cache) < 3) BuildRequires: (php-autoloader(%{gh_owner}/zend-db) >= 2.8.2 with php-autoloader(%{gh_owner}/zend-db) < 3) @@ -68,7 +67,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 with p BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5.2 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 BuildRequires: php-composer(psr/http-message) < 2 BuildRequires: php-composer(psr/http-message) >= 1.0.1 BuildRequires: php-autoloader(%{gh_owner}/zend-cache) < 3 @@ -88,21 +87,25 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.6 || ^7.0", +# "ext-dom": "*", +# "ext-libxml": "*", # "zendframework/zend-escaper": "^2.5.2", -# "zendframework/zend-stdlib": "^2.7.7 || ^3.1" +# "zendframework/zend-stdlib": "^3.2.1" Requires: php(language) >= 5.6 +Requires: php-dom +Requires: php-libxml %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/zend-escaper) >= 2.5.2 with php-autoloader(%{gh_owner}/zend-escaper) < 3) -Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.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-composer(psr/http-message) >= 1.0.1 with php-composer(psr/http-message) < 2) # remirepo:8 %else Requires: php-autoloader(%{gh_owner}/zend-escaper) < 3 Requires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5.2 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.7 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.2.1 Requires: php-composer(psr/http-message) < 2 Requires: php-composer(psr/http-message) >= 1.0.1 %endif @@ -124,9 +127,7 @@ Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 2.6.0 Requires: php-ctype Requires: php-date -Requires: php-dom Requires: php-hash -Requires: php-libxml Requires: php-pcre Requires: php-spl Requires: php-tidy @@ -196,7 +197,7 @@ EOF # TODO 7.3 stdlib "continue" targeting switch is equivalent to "break". Did you mean to use "continue 2"? ret=0 -for cmdarg in "php %{phpunit}" php70 php71 php72; do +for cmdarg in "php %{phpunit}" php70 php71 php72 php73; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} --verbose || ret=1 @@ -218,6 +219,10 @@ exit $ret %changelog +* Thu Jan 31 2019 Remi Collet <remi@remirepo.net> - 2.11.0-1 +- update to 2.11.0 +- raise dependency on zend-stdlib 3.2.1 + * Thu Aug 02 2018 Shawn Iwinski <shawn@iwin.ski> - 2.10.3-1 - Update to 2.10.3 (ZF2018-01) |