diff options
Diffstat (limited to 'php-consolidation-annotated-command.spec')
| -rw-r--r-- | php-consolidation-annotated-command.spec | 113 |
1 files changed, 60 insertions, 53 deletions
diff --git a/php-consolidation-annotated-command.spec b/php-consolidation-annotated-command.spec index d89c114..7674921 100644 --- a/php-consolidation-annotated-command.spec +++ b/php-consolidation-annotated-command.spec @@ -12,8 +12,8 @@ %global github_owner consolidation-org %global github_name annotated-command -%global github_version 2.4.5 -%global github_commit 7c97c401ea81549779ce96d62f00d230ed5ff1d8 +%global github_version 2.4.8 +%global github_commit 6672ea38212f8bffb71fec7eadc8b3372154b17e %global composer_vendor consolidation %global composer_project annotated-command @@ -23,20 +23,18 @@ # "consolidation/output-formatters": "^3.1.5" %global consolidation_output_formatters_min_ver 3.1.5 %global consolidation_output_formatters_max_ver 4 -# "psr/log": "~1" +# "psr/log": "^1" # NOTE: Min version not 1.0 because autoloader required %global psr_log_min_ver 1.0.1 %global psr_log_max_ver 2.0 # "phpdocumentor/reflection-docblock": "^2.0|^3.0.2" -# NOTE: Min version not 4.0 because v3 not packaged yet %global phpdocumentor_reflection_docblock_min_ver 2.0 -%global phpdocumentor_reflection_docblock_max_ver 3.0 -# "symfony/console": "^2.8|~3.0" -# "symfony/event-dispatcher": "^2.5|~3.0" -# "symfony/finder": "^2.5|~3.0" -# NOTE: Min version not 4.0 because v3 not packaged yet +%global phpdocumentor_reflection_docblock_max_ver 4.0 +# "symfony/console": "^2.8|~3" +# "symfony/event-dispatcher": "^2.5|^3" +# "symfony/finder": "^2.5|^3" %global symfony_min_ver 2.8 -%global symfony_max_ver 3.0 +%global symfony_max_ver 4.0 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -53,26 +51,25 @@ License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch # Tests %if %{with_tests} ## composer.json -BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(consolidation/output-formatters) < %{consolidation_output_formatters_max_ver} -BuildRequires: php-composer(consolidation/output-formatters) >= %{consolidation_output_formatters_min_ver} +BuildRequires: php(language) >= %{php_min_ver} +BuildRequires: php-composer(consolidation/output-formatters) < %{consolidation_output_formatters_max_ver} +BuildRequires: php-composer(consolidation/output-formatters) >= %{consolidation_output_formatters_min_ver} BuildRequires: php-composer(phpdocumentor/reflection-docblock) < %{phpdocumentor_reflection_docblock_max_ver} BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver} BuildRequires: php-composer(phpunit/phpunit) -BuildRequires: php-composer(psr/log) < %{psr_log_max_ver} -BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} -BuildRequires: php-composer(symfony/console) < %{symfony_max_ver} -BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver} -BuildRequires: php-composer(symfony/event-dispatcher) < %{symfony_max_ver} -BuildRequires: php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} -BuildRequires: php-composer(symfony/finder) < %{symfony_max_ver} -BuildRequires: php-composer(symfony/finder) >= %{symfony_min_ver} -## phpcompatinfo (computed from version 2.4.4) +BuildRequires: php-composer(psr/log) < %{psr_log_max_ver} +BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} +BuildRequires: php-composer(symfony/console) < %{symfony_max_ver} +BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver} +BuildRequires: php-composer(symfony/event-dispatcher) < %{symfony_max_ver} +BuildRequires: php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} +BuildRequires: php-composer(symfony/finder) < %{symfony_max_ver} +BuildRequires: php-composer(symfony/finder) >= %{symfony_min_ver} +## phpcompatinfo (computed from version 2.4.8) BuildRequires: php-dom BuildRequires: php-pcre BuildRequires: php-reflection @@ -82,20 +79,20 @@ BuildRequires: php-composer(fedora/autoloader) %endif # composer.json -Requires: php(language) >= %{php_min_ver} -Requires: php-composer(consolidation/output-formatters) < %{consolidation_output_formatters_max_ver} -Requires: php-composer(consolidation/output-formatters) >= %{consolidation_output_formatters_min_ver} +Requires: php(language) >= %{php_min_ver} +Requires: php-composer(consolidation/output-formatters) < %{consolidation_output_formatters_max_ver} +Requires: php-composer(consolidation/output-formatters) >= %{consolidation_output_formatters_min_ver} Requires: php-composer(phpdocumentor/reflection-docblock) < %{phpdocumentor_reflection_docblock_max_ver} Requires: php-composer(phpdocumentor/reflection-docblock) >= %{phpdocumentor_reflection_docblock_min_ver} -Requires: php-composer(psr/log) < %{psr_log_max_ver} -Requires: php-composer(psr/log) >= %{psr_log_min_ver} -Requires: php-composer(symfony/console) < %{symfony_max_ver} -Requires: php-composer(symfony/console) >= %{symfony_min_ver} -Requires: php-composer(symfony/event-dispatcher) < %{symfony_max_ver} -Requires: php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} -Requires: php-composer(symfony/finder) < %{symfony_max_ver} -Requires: php-composer(symfony/finder) >= %{symfony_min_ver} -# phpcompatinfo (computed from version 2.4.4) +Requires: php-composer(psr/log) < %{psr_log_max_ver} +Requires: php-composer(psr/log) >= %{psr_log_min_ver} +Requires: php-composer(symfony/console) < %{symfony_max_ver} +Requires: php-composer(symfony/console) >= %{symfony_min_ver} +Requires: php-composer(symfony/event-dispatcher) < %{symfony_max_ver} +Requires: php-composer(symfony/event-dispatcher) >= %{symfony_min_ver} +Requires: php-composer(symfony/finder) < %{symfony_max_ver} +Requires: php-composer(symfony/finder) >= %{symfony_min_ver} +# phpcompatinfo (computed from version 2.4.8) Requires: php-dom Requires: php-pcre Requires: php-reflection @@ -130,18 +127,28 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required([ '%{phpdir}/Consolidation/OutputFormatters/autoload.php', - '%{phpdir}/phpDocumentor/Reflection/DocBlock/autoload.php', + [ + '%{phpdir}/phpDocumentor/Reflection/DocBlock/autoload.php', + '%{phpdir}/phpDocumentor/Reflection/DocBlock2/autoload.php', + ], '%{phpdir}/Psr/Log/autoload.php', - '%{phpdir}/Symfony/Component/Console/autoload.php', - '%{phpdir}/Symfony/Component/EventDispatcher/autoload.php', - '%{phpdir}/Symfony/Component/Finder/autoload.php', + [ + '%{phpdir}/Symfony3/Component/Console/autoload.php', + '%{phpdir}/Symfony/Component/Console/autoload.php', + ], + [ + '%{phpdir}/Symfony3/Component/EventDispatcher/autoload.php', + '%{phpdir}/Symfony/Component/EventDispatcher/autoload.php', + ], + [ + '%{phpdir}/Symfony3/Component/Finder/autoload.php', + '%{phpdir}/Symfony/Component/Finder/autoload.php', + ] ]); AUTOLOAD %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{phpdir}/Consolidation/AnnotatedCommand cp -rp src/* %{buildroot}%{phpdir}/Consolidation/AnnotatedCommand/ @@ -160,26 +167,20 @@ sed 's/function testInteractAndValidate/function SKIP_testInteractAndValidate/' -i tests/testAnnotatedCommandFactory.php : Upstream tests -%{_bindir}/phpunit --verbose --bootstrap bootstrap.php - -: Upstream tests with SCLs if available -SCL_RETURN_CODE=0 -for SCL in %{?rhel:php55} php56 php70 php71; do - if which $SCL; then - $SCL %{_bindir}/phpunit --bootstrap bootstrap.php || SCL_RETURN_CODE=1 +RETURN_CODE=0 +for PHP_EXEC in php %{?rhel:php55} php56 php70 php71; do + if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then + $PHP_EXEC %{_bindir}/phpunit --verbose --bootstrap bootstrap.php \ + || RETURN_CODE=1 fi done +exit $RETURN_CODE %else : Tests skipped %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -189,6 +190,12 @@ rm -rf %{buildroot} %changelog +* Sat Apr 08 2017 Shawn Iwinski <shawn@iwin.ski> - 2.4.8-1 +- Update to 2.4.8 (RHBZ #1433641) +- Allow Symfony 3 +- Prepare for php-phpdocumentor-reflection-docblock => + php-phpdocumentor-reflection-docblock2 dependency rename + * Wed Mar 1 2017 Remi Collet <remi@remirepo.net> - 2.4.5-1 - update to 2.4.5 |