diff --git a/.gitignore b/.gitignore index a529b90..d313555 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /php-zendframework-zend-i18n-2.7.2-d5ce2dc.tgz /php-zendframework-zend-i18n-2.7.3-b2db0d8.tgz /php-zendframework-zend-i18n-2.7.4-d3431e2.tgz +/php-zendframework-zend-i18n-2.8.0-cfdb658.tgz diff --git a/91.patch b/91.patch deleted file mode 100644 index 6f79964..0000000 --- a/91.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 48c6362f3ce0f4f41d6e6338356481a10076813a Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 13 Feb 2018 10:22:06 +0100 -Subject: [PATCH] fix tests for recent ICU version - ---- - test/Validator/IsFloatTest.php | 2 +- - test/View/Helper/CurrencyFormatTest.php | 7 ------- - 2 files changed, 1 insertion(+), 8 deletions(-) - -diff --git a/test/Validator/IsFloatTest.php b/test/Validator/IsFloatTest.php -index a436308..eaa1eb6 100644 ---- a/test/Validator/IsFloatTest.php -+++ b/test/Validator/IsFloatTest.php -@@ -167,7 +167,7 @@ public function validationFailureProvider() - 'ar' => ['10.1', '66notflot.6'], - 'ru' => ['10.1', '66notflot.6', '2,000.00', '2 00'], - 'en' => ['10,1', '66notflot.6', '2.000,00', '2 000', '2,00'], -- 'fr-CH' => ['10,1', '66notflot.6', '2,000.00', "2'00"] -+ 'fr-CH' => ['66notflot.6', '2,000.00', "2'00"] - ]; - - //Loop locales and examples for a more thorough set of "true" test data -diff --git a/test/View/Helper/CurrencyFormatTest.php b/test/View/Helper/CurrencyFormatTest.php -index 0e616f8..b7c639b 100644 ---- a/test/View/Helper/CurrencyFormatTest.php -+++ b/test/View/Helper/CurrencyFormatTest.php -@@ -43,11 +43,6 @@ public function currencyProvider() - { - return [ - // locale currency show decimals number currencyPattern expected -- ['de_AT', 'EUR', true, 1234.56, null, '€ 1.234,56'], -- ['de_AT', 'EUR', true, 0.123, null, '€ 0,12'], -- ['de_AT', 'EUR', true, 0.123, '#,##0.00 ¤', '0,12 €'], -- ['de_AT', 'EUR', true, -0.123, '#,##0.00 ¤; ¤ - #,##0.00', ' € - 0,12'], -- ['de_AT', 'EUR', true, -0.123, '¤ #,##0.00; - ¤ #,##0.00', '- € 0,12'], - ['de_DE', 'EUR', true, 1234567.891234567890000, null, '1.234.567,89 €'], - ['de_DE', 'RUR', true, 1234567.891234567890000, null, '1.234.567,89 RUR'], - ['ru_RU', 'EUR', true, 1234567.891234567890000, null, '1 234 567,89 €'], -@@ -55,8 +50,6 @@ public function currencyProvider() - ['en_US', 'EUR', true, 1234567.891234567890000, null, '€1,234,567.89'], - ['en_US', 'RUR', true, 1234567.891234567890000, null, 'RUR1,234,567.89'], - ['en_US', 'USD', true, 1234567.891234567890000, null, '$1,234,567.89'], -- ['de_AT', 'EUR', false, 1234.56, null, '€ 1.235'], -- ['de_AT', 'EUR', false, 0.123, null, '€ 0'], - ['de_DE', 'EUR', false, 1234567.891234567890000, null, '1.234.568 €'], - ['de_DE', 'RUB', false, 1234567.891234567890000, null, '1.234.567,89 RUB'], - //array('ru_RU', 'EUR', false, 1234567.891234567890000, null, '1 234 568 €'), diff --git a/php-zendframework-zend-i18n.spec b/php-zendframework-zend-i18n.spec index 6c882ad..9b5c37d 100644 --- a/php-zendframework-zend-i18n.spec +++ b/php-zendframework-zend-i18n.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit d3431e29cc00c2a1c6704e601d4371dbf24f6a31 +%global gh_commit cfdb658121e0d7eb969a498c2f67f1eacaab9c63 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-i18n @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.7.4 -Release: 4%{?dist} +Version: 2.8.0 +Release: 2%{?dist} Summary: Zend Framework %{library} component License: BSD @@ -29,9 +29,6 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -# https://github.com/zendframework/zend-i18n/pull/91 -Patch0: https://patch-diff.githubusercontent.com/raw/zendframework/zend-i18n/pull/91.patch - BuildArch: noarch # Tests %if %{with_tests} @@ -41,9 +38,8 @@ BuildRequires: php-date BuildRequires: php-intl BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 # From composer, "require-dev": { -# "phpunit/PHPUnit": "^6.0.8 || ^5.7.15", +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", # "zendframework/zend-cache": "^2.6.1", # "zendframework/zend-coding-standard": "~1.0.0", # "zendframework/zend-config": "^2.6", @@ -52,46 +48,46 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", # "zendframework/zend-validator": "^2.6", # "zendframework/zend-view": "^2.6.3" -BuildRequires: php-composer(%{gh_owner}/zend-cache) >= 2.6.1 -BuildRequires: php-composer(%{gh_owner}/zend-config) >= 2.6 -BuildRequires: php-composer(%{gh_owner}/zend-eventmanager) >= 2.6.2 -BuildRequires: php-composer(%{gh_owner}/zend-filter) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 -BuildRequires: php-composer(%{gh_owner}/zend-validator) >= 2.6 -BuildRequires: php-composer(%{gh_owner}/zend-view) >= 2.6.3 -BuildRequires: phpunit6 +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-composer(%{gh_owner}/zend-cache) >= 2.6.1 with php-composer(%{gh_owner}/zend-cache) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-config) >= 2.6 with php-composer(%{gh_owner}/zend-config) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-composer(%{gh_owner}/zend-eventmanager) < 4) +BuildRequires: (php-composer(%{gh_owner}/zend-filter) >= 2.5 with php-composer(%{gh_owner}/zend-filter) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-composer(%{gh_owner}/zend-servicemanager) < 4) +BuildRequires: (php-composer(%{gh_owner}/zend-validator) >= 2.6 with php-composer(%{gh_owner}/zend-validator) < 3) +BuildRequires: (php-composer(%{gh_owner}/zend-view) >= 2.6.3 with php-composer(%{gh_owner}/zend-view) < 3) +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1.2 # Autoloader BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.0 || ^5.6", +# "php": "^5.6 || ^7.0", # "zendframework/zend-stdlib": "^2.7 || ^3.0" Requires: php(language) >= 5.6 %if ! %{bootstrap} -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -# From composer, "suggest": { +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +%else # "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP", # "zendframework/zend-cache": "Zend\\Cache component", # "zendframework/zend-config": "Zend\\Config component", # "zendframework/zend-eventmanager": "You should install this package to use the events in the translator", # "zendframework/zend-filter": "You should install this package to use the provided filters", +# "zendframework/zend-i18n-resources": "Translation resources", # "zendframework/zend-servicemanager": "Zend\\ServiceManager component", # "zendframework/zend-validator": "You should install this package to use the provided validators", # "zendframework/zend-view": "You should install this package to use the provided view helpers", # "zendframework/zend-resources": "Translation resources" -%if 0%{?fedora} >= 21 Suggests: php-composer(%{gh_owner}/zend-cache) Suggests: php-composer(%{gh_owner}/zend-config) Suggests: php-composer(%{gh_owner}/zend-eventmanager) Suggests: php-composer(%{gh_owner}/zend-filter) +Suggests: php-composer(%{gh_owner}/zend-i18n-resources) Suggests: php-composer(%{gh_owner}/zend-servicemanager) Suggests: php-composer(%{gh_owner}/zend-validator) Suggests: php-composer(%{gh_owner}/zend-view) -Suggests: php-composer(%{gh_owner}/zend-i18n-resources) -%endif %endif Requires: php-intl # From phpcompatinfo report for version 2.5.1 @@ -123,7 +119,6 @@ Documentation: https://zendframework.github.io/%{gh_project}/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 mv LICENSE.md LICENSE @@ -167,9 +162,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmd in php php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit6 --verbose || ret=1 +for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 fi done exit $ret @@ -187,6 +183,11 @@ exit $ret %changelog +* Thu Apr 26 2018 Remi Collet - 2.8.0-2 +- update to 2.8.0 +- switch to phpunit7 +- use range dependencies + * Tue Feb 13 2018 Remi Collet - 2.7.4-4 - fix FTBFS from Koschei, path from https://github.com/zendframework/zend-i18n/pull/91 @@ -231,4 +232,4 @@ exit $ret - normal build * Tue Aug 4 2015 Remi Collet - 2.5.1-0 -- initial package, bootstrap build \ No newline at end of file +- initial package, bootstrap build diff --git a/sources b/sources index 6d46814..cf3e109 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-zendframework-zend-i18n-2.7.4-d3431e2.tgz) = b6dea69ec8d79ba989da07785719b8a025c3c71969ffdc227c393abe1f2e5b25d23ceefc67b0212c7bde7a954b41dc4e31a6cb61a74204c762226ccaf5d1d1b7 +SHA512 (php-zendframework-zend-i18n-2.8.0-cfdb658.tgz) = fb43a8d66fea215efd3777a736ca4cd195db25e339d6f3c2d6888b929acd8f7b5f03b7730338e5b2af8c6a41d5cc1dff683ec544ec2d537ddf4c105b7bfc59a6