diff options
Diffstat (limited to 'php-consolidation-output-formatters.spec')
| -rw-r--r-- | php-consolidation-output-formatters.spec | 45 |
1 files changed, 32 insertions, 13 deletions
diff --git a/php-consolidation-output-formatters.spec b/php-consolidation-output-formatters.spec index 94be8d1..ec945ea 100644 --- a/php-consolidation-output-formatters.spec +++ b/php-consolidation-output-formatters.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-consolidation-output-formatters # -# Copyright (c) 2016-2018 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2016-2019 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -10,16 +10,19 @@ # Please preserve changelog entries # -%global github_owner consolidation-org +%global github_owner consolidation %global github_name output-formatters -%global github_version 3.2.0 -%global github_commit da889e4bce19f145ca4ec5b1725a946f4eb625a9 +%global github_version 3.5.0 +%global github_commit 99ec998ffb697e0eada5aacf81feebfb13023605 %global composer_vendor consolidation %global composer_project output-formatters # "php": ">=5.4.0" %global php_min_ver 5.4.0 +# "dflydev/dot-access-data": "^1.1.0" +%global dflydev_dot_access_data_min_ver 1.1.0 +%global dflydev_dot_access_data_max_ver 2.0 # "symfony/console": "^2.8|^3|^4" # "symfony/finder": "^2.5|^3|^4" %global symfony_min_ver 2.8 @@ -36,13 +39,16 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Format text by applying transformations provided by plug-in formatters -Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} -Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz + +# GitHub export does not include tests +# Run php-consolidation-output-formatters-get-source.sh to create full source +Source0: %{name}-%{github_version}-%{github_commit}.tar.gz +Source1: %{name}-get-source.sh BuildArch: noarch # Tests @@ -51,15 +57,18 @@ BuildArch: noarch BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(dflydev/dot-access-data) >= %{dflydev_dot_access_data_min_ver} with php-composer(dflydev/dot-access-data) < %{dflydev_dot_access_data_max_ver}) BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) BuildRequires: (php-composer(symfony/finder) >= %{symfony_min_ver} with php-composer(symfony/finder) < %{symfony_max_ver}) BuildRequires: (php-composer(symfony/var-dumper) >= %{symfony_min_ver} with php-composer(symfony/var-dumper) < %{symfony_max_ver}) %else +BuildRequires: php-composer(dflydev/dot-access-data) < %{dflydev_dot_access_data_max_ver} +BuildRequires: php-composer(dflydev/dot-access-data) >= %{dflydev_dot_access_data_min_ver} BuildRequires: php-composer(symfony/console) < %{symfony_max_ver} BuildRequires: php-composer(symfony/finder) < %{symfony_max_ver} BuildRequires: php-composer(symfony/var-dumper) < %{symfony_max_ver} %endif -## phpcompatinfo (computed from version 3.1.13) +## phpcompatinfo (computed from version 3.5.0) BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-pcre @@ -72,13 +81,16 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(dflydev/dot-access-data) >= %{dflydev_dot_access_data_min_ver} with php-composer(dflydev/dot-access-data) < %{dflydev_dot_access_data_max_ver}) Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) Requires: (php-composer(symfony/finder) >= %{symfony_min_ver} with php-composer(symfony/finder) < %{symfony_max_ver}) %else +Requires: php-composer(dflydev/dot-access-data) < %{dflydev_dot_access_data_max_ver} +Requires: php-composer(dflydev/dot-access-data) >= %{dflydev_dot_access_data_min_ver} Requires: php-composer(symfony/console) < %{symfony_max_ver} Requires: php-composer(symfony/finder) < %{symfony_max_ver} %endif -# phpcompatinfo (computed from version 3.1.13) +# phpcompatinfo (computed from version 3.5.0) Requires: php-dom Requires: php-json Requires: php-pcre @@ -118,6 +130,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Consolidation\\OutputFormatters\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ + '%{phpdir}/Dflydev/DotAccessData/autoload.php', [ '%{phpdir}/Symfony4/Component/Console/autoload.php', '%{phpdir}/Symfony3/Component/Console/autoload.php', @@ -141,8 +154,8 @@ AUTOLOAD %install -mkdir -p %{buildroot}%{phpdir}/Consolidation/OutputFormatters -cp -rp src/* %{buildroot}%{phpdir}/Consolidation/OutputFormatters/ +mkdir -p %{buildroot}%{phpdir}/Consolidation +cp -rp src %{buildroot}%{phpdir}/Consolidation/OutputFormatters %check @@ -155,12 +168,12 @@ require_once '%{buildroot}%{phpdir}/Consolidation/OutputFormatters/autoload.php' BOOTSTRAP : Skip API documentation test -rm -f tests/testAPIDocs.php +rm -f tests/APIDocsTest.php : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php55 php56} php70 php71 php72; do +for PHP_EXEC in "" %{?rhel:php55 php56 php70} php71 php72 php73 php74; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -182,6 +195,12 @@ exit $RETURN_CODE %changelog +* Sat Jun 01 2019 Shawn Iwinski <shawn@iwin.ski> - 3.5.0-2 +- Fix sources + +* Sat Jun 01 2019 Shawn Iwinski <shawn@iwin.ski> - 3.5.0-1 +- Update to 3.5.0 (RHBZ #1582691) + * Fri Mar 30 2018 Shawn Iwinski <shawn@iwin.ski> - 3.2.0-1 - Update to 3.2.0 (RHBZ #1505200) |