diff options
| author | Remi Collet <remi@remirepo.net> | 2018-11-29 08:19:33 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-11-29 08:19:33 +0100 |
| commit | 94204c21826bbf0d300a96a4b7d9c9350172200e (patch) | |
| tree | 7931b694a7392bf7d5b092bdaadd4961ba378bf8 | |
| parent | 71cb334b96bada872dbbbdb859ae95b90714e925 (diff) | |
use range dependencies and fix FTBFS
| -rw-r--r-- | php-ocramius-generated-hydrator.spec | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/php-ocramius-generated-hydrator.spec b/php-ocramius-generated-hydrator.spec index e895a5a..0e3b90a 100644 --- a/php-ocramius-generated-hydrator.spec +++ b/php-ocramius-generated-hydrator.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 5%{?github_release}%{?dist} Summary: An object hydrator Group: Development/Libraries @@ -49,13 +49,20 @@ BuildArch: noarch %if %{with_tests} # composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -BuildRequires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(nikic/php-parser) >= %{php_parser_min_ver} with php-composer(nikic/php-parser) < %{php_parser_max_ver}) +BuildRequires: (php-composer(ocramius/code-generator-utils) >= %{ocramius_cgu_min_ver} with php-composer(ocramius/code-generator-utils) < %{ocramius_cgu_max_ver}) +BuildRequires: (php-composer(zendframework/zend-hydrator) >= %{zf_hydrator_min_ver} with php-composer(zendframework/zend-hydrator) < %{zf_hydrator_max_ver}) +# remirepo:7 +%else +BuildRequires: php-nikic-php-parser3 >= %{php_parser_min_ver} BuildRequires: php-composer(ocramius/code-generator-utils) < %{ocramius_cgu_max_ver} BuildRequires: php-composer(ocramius/code-generator-utils) >= %{ocramius_cgu_min_ver} +BuildRequires: php-composer(zendframework/zend-hydrator) < %{zf_hydrator_max_ver} +BuildRequires: php-composer(zendframework/zend-hydrator) >= %{zf_hydrator_min_ver} +%endif BuildRequires: php-composer(phpunit/phpunit) >= 5.0 -BuildRequires: php-composer(zendframework/zend-hydrator) < %{zf_hydrator_max_ver} -BuildRequires: php-composer(zendframework/zend-hydrator) >= %{zf_hydrator_min_ver} # phpcompatinfo (computed from version 2.1.0) BuildRequires: php-date BuildRequires: php-reflection @@ -66,12 +73,19 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -Requires: php-composer(nikic/php-parser) < %{php_parser_max_ver} -Requires: php-composer(nikic/php-parser) >= %{php_parser_min_ver} +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(nikic/php-parser) >= %{php_parser_min_ver} with php-composer(nikic/php-parser) < %{php_parser_max_ver}) +Requires: (php-composer(ocramius/code-generator-utils) >= %{ocramius_cgu_min_ver} with php-composer(ocramius/code-generator-utils) < %{ocramius_cgu_max_ver}) +Requires: (php-composer(zendframework/zend-hydrator) >= %{zf_hydrator_min_ver} with php-composer(zendframework/zend-hydrator) < %{zf_hydrator_max_ver}) +# remirepo:7 +%else +Requires: php-nikic-php-parser3 >= %{php_parser_min_ver} Requires: php-composer(ocramius/code-generator-utils) < %{ocramius_cgu_max_ver} Requires: php-composer(ocramius/code-generator-utils) >= %{ocramius_cgu_min_ver} -Requires: php-composer(zendframework/zend-hydrator) < %{zf_hydrator_max_ver} -Requires: php-composer(zendframework/zend-hydrator) >= %{zf_hydrator_min_ver} +Requires: php-composer(zendframework/zend-hydrator) < %{zf_hydrator_max_ver} +Requires: php-composer(zendframework/zend-hydrator) >= %{zf_hydrator_min_ver} +%endif # phpcompatinfo (computed from version 2.1.0) Requires: php-reflection Requires: php-spl @@ -134,7 +148,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for PHP_EXEC in php php71 php72; do +for PHP_EXEC in php php71 php72 php73; do if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC %{_bindir}/phpunit --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -155,6 +169,9 @@ exit $RETURN_CODE %changelog +* Thu Nov 29 2018 Remi Collet <remi@fedoraproject.org> - 2.1.0-5 +- use range dependencies and fix FTBFS + * Mon Aug 7 2017 Remi Collet <remi@fedoraproject.org> - 2.1.0-2 - clean autoloader |