From d40846d7e00533d613e436c112d5000fca06ea24 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 7 Dec 2018 10:24:59 +0100 Subject: use range dependencies --- php-phpdocumentor-type-resolver.spec | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/php-phpdocumentor-type-resolver.spec b/php-phpdocumentor-type-resolver.spec index d3dc60e..9f66a77 100644 --- a/php-phpdocumentor-type-resolver.spec +++ b/php-phpdocumentor-type-resolver.spec @@ -34,7 +34,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 5%{?github_release}%{?dist} Summary: A PSR-5 based resolver of Class names, Types and Structural Element Names Group: Development/Libraries @@ -51,11 +51,18 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(mockery/mockery) < %{mockery_max_ver} -BuildRequires: php-composer(mockery/mockery) >= %{mockery_min_ver} +BuildRequires: php-composer(phpunit/phpunit) +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) +BuildRequires: (php-composer(mockery/mockery) >= %{mockery_min_ver} with php-composer(mockery/mockery) < %{mockery_max_ver}) +# remirepo:6 +%else BuildRequires: php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver} BuildRequires: php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} -BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: php-composer(mockery/mockery) < %{mockery_max_ver} +BuildRequires: php-composer(mockery/mockery) >= %{mockery_min_ver} +%endif ## phpcompatinfo (computed from version 0.4.0) BuildRequires: php-reflection BuildRequires: php-spl @@ -66,8 +73,14 @@ BuildRequires: php-fedora-autoloader-devel # composer.json Requires: php(language) >= %{php_min_ver} +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) +# remirepo:4 +%else Requires: php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} Requires: php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver} +%endif # phpcompatinfo (computed from version 0.4.0) Requires: php-spl Requires: php-tokenizer @@ -140,7 +153,7 @@ sed 's#vendor/mockery/mockery/library#%{phpdir}#' phpunit.xml.dist > phpunit.xml : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in php php56 php70 php71 php72; do +for PHP_EXEC in php php56 php70 php71 php72 php73; do if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC -d auto_prepend_file=$PWD/bootstrap.php \ $PHPUNIT --verbose --bootstrap bootstrap.php \ @@ -167,6 +180,9 @@ exit $RETURN_CODE %changelog +* Fri Dec 7 2018 Remi Collet - 0.4.0-5 +- use range dependencies + * Mon Jul 17 2017 Shawn Iwinski - 0.4.0-1 - Update to 0.4.0 (RHBZ #1460503) - Add "get source" script because upstream attributes removed tests from snapshot -- cgit