From b2083086a0d1f369bc7105f7ea4a4c73d9087c8a Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: May 14 2019 22:37:21 +0000 Subject: Update to 0.10.1 (RHBZ #1562562) - Add range version dependencies for Fedora >= 27 || RHEL >= 8 --- diff --git a/.gitignore b/.gitignore index be94f34..ac473de 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-stecman-symfony-console-completion-0.7.0-5461d43e53092b3d3b9dbd9d999f2054730f4bbb.tar.gz +/php-stecman-symfony-console-completion-0.10.1-7bfa9b93e216896419f2f8de659935d7e04fecd8.tar.gz diff --git a/composer.json b/composer.json index 35b75ab..e7af3a7 100644 --- a/composer.json +++ b/composer.json @@ -10,10 +10,10 @@ ], "require": { "php": ">=5.3.2", - "symfony/console": "~2.3 || ~3.0" + "symfony/console": "~2.3 || ~3.0 || ~4.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "~4.8.36 || ~5.7 || ~6.4" }, "autoload": { "psr-4": { @@ -22,7 +22,7 @@ }, "extra": { "branch-alias": { - "dev-master": "0.6.x-dev" + "dev-master": "0.10.x-dev" } } } diff --git a/php-stecman-symfony-console-completion.spec b/php-stecman-symfony-console-completion.spec index f338244..cb9126a 100644 --- a/php-stecman-symfony-console-completion.spec +++ b/php-stecman-symfony-console-completion.spec @@ -1,7 +1,7 @@ # # Fedora spec file for php-stecman-symfony-console-completion # -# Copyright (c) 2017 Shawn Iwinski +# Copyright (c) 2017-2019 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -11,18 +11,18 @@ %global github_owner stecman %global github_name symfony-console-completion -%global github_version 0.7.0 -%global github_commit 5461d43e53092b3d3b9dbd9d999f2054730f4bbb +%global github_version 0.10.1 +%global github_commit 7bfa9b93e216896419f2f8de659935d7e04fecd8 %global composer_vendor stecman %global composer_project symfony-console-completion # "php": ">=5.3.2" %global php_min_ver 5.3.2 -# "symfony/console": "~2.3 || ~3.0" +# "symfony/console": "~2.3 || ~3.0 || ~4.0" # NOTE: Min version not 2.3 because autoloader required %global symfony_min_ver %{?el6:2.3.31}%{!?el6:2.7.1} -%global symfony_max_ver 4.0 +%global symfony_max_ver 5.0 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -31,7 +31,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 5%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Automatic BASH completion for Symfony Console based applications License: MIT @@ -44,10 +44,15 @@ BuildArch: noarch ## composer.json BuildRequires: php(language) >= %{php_min_ver} BuildRequires: php-composer(phpunit/phpunit) +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) +%else BuildRequires: php-composer(symfony/console) < %{symfony_max_ver} BuildRequires: php-composer(symfony/console) >= %{symfony_min_ver} -## phpcompatinfo for version 0.7.0 +%endif +## phpcompatinfo for version 0.10.1 BuildRequires: php-pcre +BuildRequires: php-reflection BuildRequires: php-spl ## Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -55,9 +60,13 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(symfony/console) >= %{symfony_min_ver} with php-composer(symfony/console) < %{symfony_max_ver}) +%else Requires: php-composer(symfony/console) < %{symfony_max_ver} Requires: php-composer(symfony/console) >= %{symfony_min_ver} -# phpcompatinfo for version 0.7.0 +%endif +# phpcompatinfo for version 0.10.1 Requires: php-pcre Requires: php-spl # Autoloader @@ -97,6 +106,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Dependencies::required(array( array( + '%{phpdir}/Symfony4/Component/Console/autoload.php', '%{phpdir}/Symfony3/Component/Console/autoload.php', '%{phpdir}/Symfony/Component/Console/autoload.php', ), @@ -122,7 +132,7 @@ sed \ : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php54 php55} php56 php70 php71 php72; do +for PHP_EXEC in "" %{?rhel:php54 php55} php56 php70 php71 php72 php73 php74; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose \ --bootstrap %{buildroot}%{phpdir}/Stecman/Component/Symfony/Console/BashCompletion/autoload.php \ @@ -148,6 +158,10 @@ exit $RETURN_CODE %changelog +* Tue May 14 2019 Shawn Iwinski - 0.10.1-1 +- Update to 0.10.1 (RHBZ #1562562) +- Add range version dependencies for Fedora >= 27 || RHEL >= 8 + * Sat Feb 02 2019 Fedora Release Engineering - 0.7.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 9125842..e7f85b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-stecman-symfony-console-completion-0.7.0-5461d43e53092b3d3b9dbd9d999f2054730f4bbb.tar.gz) = 5355faf44c1e0e4c5bf45e5adbb5e02f8241355cc81d11aa61598e38714739e111d0bba06004034c7ba30139d4902bf2692611777c36ed811221899182aa1e27 +SHA512 (php-stecman-symfony-console-completion-0.10.1-7bfa9b93e216896419f2f8de659935d7e04fecd8.tar.gz) = 54c1d87d52bf7d262fa5d30d1ac5a2dad91b120128e9180d82a2fb8659cfb4212f37331bfe4d6b07cf35c15eda8b21de92b11517b0751da6ec6b01b00bacfc8f