From 4a6c1f8c1fcde3c121bea8c79fb834138edb39f4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Apr 2018 14:06:48 +0200 Subject: v2.10.0 --- php-zendframework-zend-log.spec | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'php-zendframework-zend-log.spec') diff --git a/php-zendframework-zend-log.spec b/php-zendframework-zend-log.spec index 35aeec0..89f9616 100644 --- a/php-zendframework-zend-log.spec +++ b/php-zendframework-zend-log.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit bf7489578d092d6ff7508117d1d920a4764fbd6a +%global gh_commit 9cec3b092acb39963659c2f32441cccc56b3f430 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-log @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.9.2 -Release: 4%{?dist} +Version: 2.10.0 +Release: 2%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -30,8 +30,6 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -Patch0: https://patch-diff.githubusercontent.com/raw/zendframework/zend-log/pull/79.patch - BuildArch: noarch # Tests %if %{with_tests} @@ -53,19 +51,15 @@ BuildRequires: php-composer(psr/log) >= 1.0 # "zendframework/zend-escaper": "^2.5", # "zendframework/zend-filter": "^2.5", # "zendframework/zend-mail": "^2.6.1", -# "zendframework/zend-validator": "^2.6" +# "zendframework/zend-validator": "^2.10.1" BuildRequires: php-composer(mikey179/vfsStream) >= 1.6 BuildRequires: php-autoloader(%{gh_owner}/zend-console) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-db) >= 2.6 BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.5 BuildRequires: php-autoloader(%{gh_owner}/zend-mail) >= 2.6.1 -BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.6 -%if 0%{?fedora} >= 26 +BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1 %global phpunit %{_bindir}/phpunit6 -%else -%global phpunit %{_bindir}/phpunit -%endif BuildRequires: %{phpunit} # Optional dep BuildRequires: php-autoloader(%{gh_owner}/zend-mime) >= 2.5 @@ -94,7 +88,6 @@ Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 # "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML log formatter", # "zendframework/zend-mail": "Zend\\Mail component to use the email log writer", # "zendframework/zend-validator": "Zend\\Validator component to block invalid log messages" -%if 0%{?fedora} >= 21 Suggests: php-pecl(mongo) Suggests: php-pecl(mongodb) Suggests: php-autoloader(%{gh_owner}/zend-console) @@ -103,7 +96,6 @@ Suggests: php-autoloader(%{gh_owner}/zend-escaper) Suggests: php-autoloader(%{gh_owner}/zend-mail) Suggests: php-autoloader(%{gh_owner}/zend-validator) %endif -%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 2.6.0 @@ -132,7 +124,6 @@ Documentation: https://zendframework.github.io/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 mv LICENSE.md LICENSE @@ -181,7 +172,7 @@ EOF rm test/Writer/MongoDBTest.php ret=0 -for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmdarg in "php %{phpunit}" php70 php71 php72; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 @@ -202,6 +193,9 @@ exit $ret %changelog +* Wed Apr 11 2018 Remi Collet - 2.10.0-2 +- update to 2.10.0 + * Tue Dec 12 2017 Remi Collet - 2.9.2-4 - switch from zend-loader to fedora/autoloader -- cgit